no message
Merge branch 'master' of https://github.com/gg-trickitty/ejero

Conflicts:
	app/styles/components.scss
User profile
Merge branch 'master' of https://github.com/gg-trickitty/ejero

Conflicts:
	app/styles/components.scss
	app/styles/main.scss
Dropdown styles header
Entertainment page added
page fixes