temp db info
Merge branch 'master' of https://github.com/HammockHackers/iCollaborate into nate
migrations
Merge branch 'nate' of https://github.com/HammockHackers/iCollaborate into nate