udpate back top
udpate back top
Merge branch 'master' of https://github.com/tuyetle/Q-A-Platform
Merge branch 'tuyetle'

Conflicts:
	app/styles/custom.css
Modified   app/scripts/directives.js