added functionalities for the User panel
updated header design.
SCSS build
Merge branch 'develop' of https://github.com/elwhizard/MeRoRs into develop

Conflicts:
	app/styles/main.css
	app/styles/main.scss