updated from upstream
added jdbc driver
merged with the new jdbc driver
Merge remote-tracking branch 'upstream/master' into modifyLog
Merge remote-tracking branch 'upstream/master' into modifyLog
merged with activation code of memberRegistration.js
reverted changes in heroku.sh
Merge branch 'modifyLog' of https://github.com/mekanizumutc/tc-api into jdbc-driver