context-param
Merge branch 'master' of https://github.com/kainasdaq/Bookstore.git

Conflicts:
	Bookstore_v1/WebContent/WEB-INF/web.xml