swert
zzxczxc
Merge branch 'master' of https://github.com/DHXD/DataLogger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.inc
Merge branch 'master' of https://github.com/DHXD/DataLogger
tram