- merge conflict
Merge branch 'develop' of https://github.com/quinnjn/HackRegina2013 into develop
- Added logic to pull/update facilities in facility list screen.