Added new icons structure
Role header added
Merge
Merge origin/master

Conflicts:
	styles/main.css