Merge branch 'master' into develop

# Conflicts:
#	.sandstorm/sandstorm-pkgdef.capnp
#	.snapcraft/edge/snapcraft.yaml
#	.snapcraft/stable/snapcraft.yaml
#	package.json
#	packages/rocketchat-lib/rocketchat.info

HISTORY.md

 # History
 
+## 0.48.1, 2016-Dec-13
+
+- Fix integration payload JSON.parse 
+
 ## 0.48.0, 2016-Dec-12
 
 - Add CustomOAuth logger