Daily report project
Merge branch 'master' of https://github.com/cuongnv540/DailyReport

Conflicts:
	app/assets/stylesheets/custom.css.scss