from yesterday :)
Merge branch 'master' of https://github.com/mysmartcity/flux

Conflicts:
	client/app/account/settings/settings.html
	client/app/main/main.css
Merge branch 'master' of https://github.com/mysmartcity/flux
update design & page translation