Finalize
Merge branch 'master' of https://github.com/ducdigital/s42m

Conflicts:
	www/css/app.min.css