Updating merge database for compressed database file
merging dev + fixing broken tests
fixing bug in merging database not finding extracted db file
FAIMS-185: Adding rake task to generate server properites file
Merge branch 'dev'
FAIMS-185: removing unused counter
FAIMS-188: adding key (UUID) to projects + changing android controllers to use key instead of id + fixing bug in merge database that would not cleanup temp directory if exception was raised
FAIMS-184 - Add read only attribute for field
FAIMS-94: refactoring project directory structure + adding ruby only archiving library
FAIMS-94: fixing archiving to use command line tar as minitar doesn't support directory change option (needs more research) + adding tests to check if archives are correct
FAIMS-94: fixing bug that didn't copy geometry columns when creating app database + using command line tar to unarchive files as minitar doesn't support directory change option
fixing server discovery to handle multiple network cards
merging master
FAIMS-94: fixing broken test
FAIMS-92 - Add static data configuration and enable to edit the static data
merge master
FAIMS-92 - Add static data configuration and enable to edit the static data
FAIMS-94: updating ddl for projects to add version table and version columns + updating merging databse to use merge daemon
FAIMS-92 - change name to project name
FAIMS-94: fixing bug that set rails env to test