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

Conflicts:
	www/sites/domua.khituongthuyvan.net/themes/datalogger/template.php
Merge branch 'master' of https://github.com/DHXD/DataLogger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/features/openlayers/openlayers.module
	www/sites/domua.khituongthuyvan.net/modules/features/openlayers/plugins/layer_types/openlayers_layer_type_virtualearth.inc
	www/sites/domua.khituongthuyvan.net/modules/features/openlayers/plugins/layer_types/openlayers_layer_type_yahoo.inc
Merge branch 'master' of https://github.com/DHXD/DataLogger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/features/openlayers/plugins/behaviors/openlayers_behavior_popup.js
cc
cc
cc
Merge branch 'master' of https://github.com/DHXD/DataLogger

Conflicts:
	www/sites/domua.khituongthuyvan.net/modules/datalogger/datalogger.admin.inc