issue #24 bug views and controllers changed
issue #24 bug fixed
issue #24 resolved
#14 – issue types
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ru/hse/esadykov/controller/BugListController.java
	src/main/java/ru/hse/esadykov/dao/BugDao.java
	src/main/java/ru/hse/esadykov/model/Bug.java
#14 – issue types complete
Merge remote-tracking branch 'remotes/origin/master' into daniil

Conflicts:
	src/main/java/ru/hse/esadykov/controller/BugController.java
	src/main/webapp/WEB-INF/jsp/bug.jsp
	src/main/webapp/WEB-INF/jsp/bugs.jsp
	src/main/webapp/WEB-INF/jsp/projects.jsp