just working
Merge branch 'master' into develop

Conflicts:
	client/manage/assets/sass/_constants.sass