a
Merge branch 'master' of github.com:AeonAxan/magnovite-2015

Conflicts:
	app/main/templates/home.html
Icon added in titlebar