repair font-awesome, migrate overthrow to bower
Merge branch 'master' of https://github.com/c58/StudyTime-client

Conflicts:
	app/assets/index.html
	app/partials/index.jade
	bower.json