local merge
Merge branch 'master' of https://github.com/FoOTOo/NUEDC-2014-HIT
add control via web
Merge branch 'master' of https://github.com/FoOTOo/NUEDC-2014-HIT
optimize history query & fix datepicker bugs in chrome