merging changes from Ian
Merge branch 'master' of github.com:FoodCircles/food_circles

Conflicts:
	log/development.log
fixing slider on venue page
handling missing image