aaa
Merge branch 'develop' of https://github.com/linhcatcat/nghiphep into develop

Conflicts:
	app/logs/dev.log
update frontend