added bootstrap, JPA, corrected logic of CRUD
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/UserCRUD_war.xml
	.idea/artifacts/UserCRUD_war_exploded.xml
	.idea/dataSources.xml
	UserCRUD.iml
	pom.xml
	src/main/java/ua/sergiishapoval/controller/UserController.java
	src/main/java/ua/sergiishapoval/model/User.java
	src/main/resources/log4j.xml
	src/main/webapp/WEB-INF/jsp/includes.jsp
	src/main/webapp/WEB-INF/jsp/user.jsp
	src/main/webapp/WEB-INF/spring-servlet.xml
	src/main/webapp/WEB-INF/web.xml