Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
changed db parameter for CI server
Added shutdown procedure for CI
Merge branch 'master' of github.com:ubc/acj-versus
disabled one test
Modified test for CI
Changed decimal format for Python 2.6