Committing the versions from perfomatix
Merge remote-tracking branch 'origin/master'

Conflicts:
	perfomatix-commerce/perfomatix-api/src/main/java/com/perfomatix/commerce/business/CustomUserProfile.java
	perfomatix-commerce/perfomatix-api/src/main/java/com/perfomatix/commerce/framework/beans/CustomUser.java
	perfomatix-commerce/perfomatix-api/src/main/java/com/perfomatix/commerce/framework/beans/LoginUser.java
	perfomatix-commerce/perfomatix-api/src/main/java/com/perfomatix/commerce/framework/utils/Base64Decoder.java
	perfomatix-commerce/perfomatix-api/src/main/java/com/perfomatix/commerce/framework/utils/Constants.java
	perfomatix-commerce/perfomatix-api/src/main/webapp/WEB-INF/config/data-context.xml
	perfomatix-commerce/perfomatix-api/src/main/webapp/WEB-INF/config/security-context.xml
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/css/inline.css
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/css/projectred.css
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/index.html
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/js/app.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/js/controllers/EditUserController.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/js/controllers/commonController.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/js/controllers/logincontrollers.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/js/directives/UserRegValidationDirective.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/js/services/UserProfileService.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/js/services/authService.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/js/services/createUserService.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/js/services/utilService.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/lib/angular/angular-cookies.min.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/lib/boot_strap/jquery.flot.categories.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/lib/boot_strap/jquery.flot.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/lib/boot_strap/jquery.js
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/partials/EditUser.html
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/partials/dashboard.html
	perfomatix-commerce/perfomatix-api/src/main/webapp/app/partials/home.html