Add models and fixing security issue
Merge remote-tracking branch 'origin/master'

Conflicts:
	smartbuy-webapi/src/main/java/com/smartbuy/controllers/DelphiServiceController.java