Fixed backbone by changing the model name from Option to Choice... Yeah...
Merge branch 'master' of github.com:mike590/MetroGenie

Conflicts:
	public/javascripts/bxslider.js