no message
Merge branch 'hotfix/0.1.4' into develop

Conflicts:
	app/assets/javascripts/application.js
Merge branch 'develop'

* develop:
  no message