merger
Merge branch 'master' of https://github.com/devDesign/KarmaCloud into layout_branch

Conflicts:
	public/stylesheets/style.css.map
layout
works