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

Conflicts:

	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.pages.vietbando.inc
-----
----
tu
---Tu
---tu