Cancellation Policies
Merge branch 'master' of https://github.com/mdavix/real-angular-rooms into CancellationPolicies

Conflicts:
	api/server.js
	db/query/lib/public.js
	db/query/scripts/seed.js
	db/setup/config.js
	webClient/public/app.js
	webClient/public/domain/domain.js
	webClient/public/index.html
no message
Merge branch 'master' of https://github.com/mdavix/real-angular-rooms into CancellationPolicies