enhancement #8
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ru/hse/esadykov/controller/BugController.java
	src/main/java/ru/hse/esadykov/dao/BugDao.java
	src/main/java/ru/hse/esadykov/model/Bug.java
	src/main/resources/application-context.xml
Merge remote-tracking branch 'origin/master'