no message
Merge branch 'master' of https://github.com/m2mIO/thingfabric-heroku-app

Conflicts:
	.env