Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts: app/views/layouts/base_org2.html.erbbeidou_tim
commit
23a6604e47
Conflicts: app/views/layouts/base_org2.html.erbbeidou_tim