Merge branch 'ohmage-2.16' of github.com:cens/ohmageServer
Merge branch 'ohmage-2.16' of github.com:cens/ohmageServer
Merge branch 'ohmage-2.16' of github.com:cens/ohmageServer
Update Concordia to latest version .
Allow for null wifi_data object. The wifi_data object is marked as optional in the stream definition, but this older mobility code was never updated to reflect that.
Prevent overwrite of audit information from superclass. Closes #211
Optimized stream read SQL
Added testOnBorrow to avoid the case where MySQL's wait_timeout config setting is smaller than our minEvictableIdleTimeMillis value.
Merge branch 'ohmage-2.16' of github.com:ohmage/server into ohmage-2.16-user_setup_password