add
Merge branch 'master' of https://github.com/himeshsameera/smartshopping

Conflicts:
	MSS 2013-12-18/MSSServerApp/WebContent/WEB-INF/Views/ShowResult.html