try to get back on track
tests
Merge branch 'master' of https://github.com/OT-SIMS-2013/server.git
Merge branch 'master' of https://github.com/OT-SIMS-2013/server.git
Merge branch 'master' of https://github.com/OT-SIMS-2013/server.git
status in progress & closed
change status in avail_act
Merge branch 'master' of https://github.com/OT-SIMS-2013/server.git