Handle facilities in correct order
Merge branch 'master' of https://github.com/Softwire/game-off-2013 into fix-tests

Conflicts:
	src/scripts/facilityList.js
Merge pull request #25 from Softwire/fix-tests

Fix tests