test after dev
Merge branch 'master' into dev

Conflicts:
	client/app/assets/index.html
	client/public/index.html
resolve conflict with master