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
trying to fix weirdness
dependency checkin
dumb line endings
Studio contest detail fixes and naming consistency (more work needed)
bug fix for multiple final fix phases
fix for multiple approval phases
fixed inserting country code
Update html.ejs

Updated activation email content
fixed getting country code
Merge pull request #40 from mekanizumutc/fix_country_code

save country code instead of country name in coder table when doing registration
added countries action
fixed action name