initial draft for order cancellation
OC-2
updated styles for order cancellation
Merge branch 'master' into feature/order_cancellation
Updated CORS access control allow headers
Updated UI interaction with the backend and added dummy reponse
Merge remote-tracking branch 'origin/master' into feature/order_cancellation

Conflicts:
	app/controllers/OrderController.java
	conf/routes
	dmui/app/scripts/controllers/order.js
	dmui/app/scripts/services/authenticationservice.js
	dmui/app/views/order.html
Updated Cors Composition to add a few more allowed headers

Updated orderservice to connect to multiple services
Merge remote-tracking branch 'origin/master' into feature/order_cancellation