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

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

Conflicts:
	app/actions.rb