Fix the homepage

Fixed the styling on the homepage
Fix the homepage
Merge branch 'dev' of https://github.com/nxttmac/roloduck into dev

Conflicts:
	roloduck/app/models/__init__.pyc
	roloduck/app/models/user/UserDao.pyc
	roloduck/app/models/user/__init__.pyc
	roloduck/templates/common/navbar.html
	roloduck/templates/index.html
Fix the homepage
Merge branch 'dev' of https://github.com/nxttmac/roloduck into dev