Updated Home screen
Merge branch 'master' of https://github.com/conradhappeliv/grubeez

Conflicts:
	templates/splash.tpl