did some little refactoring
Started showGroups and added sitebuttons to homescreen
Merge branch 'master' of https://github.com/Project-Phoenix/Website

Conflicts:
	app/controllers/Application.java
	conf/routes