FAIM-238: fixing bug where lock was removed + updating rvmrc
merging master
Fixed the upload project
FAIMS-238: adding rvmrc
FAIMS-238: fixing bugs in generating sync database
FAIMS-238: fixing bug with archive info version not being string
FAIMS-238: fixed bug where locked was checked when only reading from the database
FAIMS-238: renaming lock and dirty files + fixing version in json for archives
FAIMS-238 - Fix excluding lock and dirty file when archiving
FAIMS-244 - Add file browser to the server
FAIMS-215 & FAIMS-286 - Fix the sqlite3 busy exception and no memory error by changing to unicorn
FAIMS-244 - fix the ui and add back button
cleaning code
FAIMS-243: refactoring code
cleaning code
FAIMS-243: refactoring code
refactoring code
merging theeban_dev