general commit
Merge branch 'dev-jobsCrowdflower' of https://github.com/thekage91/CatalogOfDesires into dev-jobsCrowdflower

Conflicts:
	.idea/workspace.xml