Edited with profile
Merge branch 'master' of https://github.com/ducdigital/s42m

Conflicts:
	scss/components/components.scss
	www/css/app.css
	www/css/app.min.css
Completed the profile page