updated to 1.9.15 sdk
Merge branch 'master' of https://github.com/shashi-svaad/frntnd

Conflicts:
	war/WEB-INF/classes/.gitignore