0.9: Rolling back code to fix merge error
Merge branch 'master' of https://github.com/GTCjavaee/lexi-config

Conflicts:
	lexi-angular/WebContent/app.js
	lexi-angular/WebContent/appController.js
	lexi-angular/WebContent/booking/bookingController.js
	lexi-angular/WebContent/booking/views/selectAdventureCategory.html

	lexi-angular/WebContent/components/services/booking/adventureCategoryService.js

	lexi-angular/WebContent/components/services/booking/models/adventureCategoryModel.js
	lexi-angular/WebContent/components/services/objectToModelService.js
	lexi-angular/WebContent/js/filters.js