Quyet 7-11
Merge branch 'master' of https://github.com/DHXD/logger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.inc
quyet 7 -11
Merge branch 'master' of https://github.com/DHXD/logger
-----------