adding heat map data by category for user to choose from
merging with master
fixing fake heat category data
fixing test data
adding more test data
adding concert and restaurant scenarios
adding profile pictures
merging with master
merging with master
fixing test data
Merge branch 'master' of https://github.com/ahmedhawas/Hot-Spotter into map+video

Conflicts:
	.DS_Store
	app/.DS_Store
	app/assets/.DS_Store
added .DS_Store to gitignore
adding .DS to ignore
chaning demo.rake to have live updates
fixing facebook bug
fixing title to Sizzle from Hotspotter
fixing title