Expedia-fying cities view page/controller; new continuously variable pricing model
Merge branch 'dev' of https://github.com/roomblocker/roomblocker-mean into dev

Conflicts:
	public/modules/cities/views/view-city.client.view.html