Merge branch 'hoanguyen-master'

Conflicts:
	app/styles/custom.css
Modified   app/index.html
Modified   app/scripts/services.js
Modified   app/styles/custom.css
Modified   app/views/questions-list.html
Merge branch 'master' of https://github.com/dluyllong/Q-A-Platform
Merge branch 'dluyllong-master'