allow hyphen in org name
#95
Merge branch 'sprint15'

Conflicts:
	pilot/view/script/script.js
lightbox filter display
db backups
Merge pull request #22 from NorthBridge/master

sprint 16 deploy