cant remember
Merge branch 'master' of https://github.com/ledenis/cloud-project

Conflicts:
	cloud-project/src/project/bookinfo/search/CreateShelfServlet.java
	cloud-project/war/WEB-INF/createdShelf.jsp
	cloud-project/war/WEB-INF/tags/wrapper.tag
Merge branch 'master' of https://github.com/ledenis/cloud-project