merge
modals
modals
Merge branch 'layout_branch'
"update"
Merge branch 'master' of https://github.com/devDesign/KarmaCloud
Merge branch 'maps-api'
working on profile page layout
modals
Merge branch 'master' of https://github.com/devDesign/KarmaCloud into layout_branch
profile page up
sass cache
merge conflicts
fixed
Ajax request for lat-longs working and populating map
Merge branch 'master' of https://github.com/devDesign/KarmaCloud

Conflicts:
	app/actions.rb
random lat longs
Merge branch 'master' into maps-api

Conflicts:
	app/actions.rb
	config/database.rb
udated seed algorithm and js form location