fix
Merge branch 'master' of github.com:devDesign/KarmaCloud

Conflicts:
	app/layout.erb
migrated user show to erb
layout
Merge branch 'master' of https://github.com/devDesign/KarmaCloud
karma gifting almost working
Merge branch 'master' of github.com:devDesign/KarmaCloud
Merge branch 'profile-page-fixes'

Conflicts:
	app/actions.rb
layout merge
adding login karma
layout
Merge branch 'master' of github.com:devDesign/KarmaCloud
Merge branch 'maps-api'

Conflicts:
	app/actions.rb
clusters