cors fixed
Merge branch 'philipp' of https://github.com/hackandtravel/opendoor into philipp

Conflicts:
	server/DAO/device.js
	server/DAO/key.js
	server/clientSide.js
	server/serverSide.js
	server/spec/api/api_spec.js