Merge branch 'hoanguyen-master'

Conflicts:
	app/styles/custom.css
Merge branch 'master' of https://github.com/dluyllong/Q-A-Platform