pulling for map fix
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt
pulling gabe's tests
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt
Merge pull request #79 from wentingrohwer/master

fixed image page for the route home->search->detailed items-> photo
added date and time fields to user form, added menu icons
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt into user-profile

Conflicts:
	app/js/templates/user_add_new_sale_form.html
Merge pull request #80 from lolanysf/user-profile

Create Event Form
fix edit new item bug
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt into upload-new-item
update upload gallery tests
remove console logs from server
Merge pull request #81 from GabeMedrash/upload-new-item

fix edit new item bug
re-insert url hashing
change incorrect status codes
Merge pull request #82 from GabeMedrash/url-hashing

fix hashing and status codes
fix go back to search result page
Merge branch 'master' of https://github.com/DrivewayHunt/DrivewayHunt
fix test fail