using dist for front-end
Merge branch 'release/test'

Conflicts:
	app.js
Merge branch 'release/v1.1'

Conflicts:
	app.js
Merge branch 'master' into dev
turned off console logs
Merge branch 'hotfix/log' into dev
Merge branch 'dev' into feature/manage