#22 start changing the main navigation
Merge branch 'master' of https://github.com/crispab/feedme5 into login

# By Yassal Sundman
# Via Yassal Sundman
* 'master' of https://github.com/crispab/feedme5:
  #22 start changing the main navigation

Conflicts:
	client/html/main.html