ember-couchdb-kit toegevoegd
Merge branch 'master' of https://github.com/citycrush/citycrush

Conflicts:
	dist/test/devtest.html