fuck this / rollback
Merge branch 'master' of https://github.com/vu4you/vu4you

Conflicts:
	app/views/startpage.php