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

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

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

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.excel.month.inc
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.excel.stations.day.inc
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.inc
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.pages.vietbando.inc
-------
Merge branch 'master' of https://github.com/DHXD/logger

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

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

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

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