fixing cros
Merge branch 'backup-cros-fixing'

Conflicts:
	SmartBuyPortal/WebContent/app/scripts/services/authenticationservice.js
	SmartBuyPortal/WebContent/app/scripts/services/delphiservice.js
	smartbuy-webapi/src/main/java/com/smartbuy/security/SecurityConfig.java
	smartbuy-webapi/src/main/java/com/smartbuy/security/SimpleCORSFilter.java