initial version of security
custom login
Merge branch 'master' into auth
creators added to model and dao
logout
issue #9 - closing bugs
issue #9 - solved except for creator_id extraction
Merge branch 'bugcreators'
Merge branch 'master' of https://github.com/Xokker/bugtracking
jdbc auth provider
enhancement #8
#3 complete. logout button.
Merge branch 'auth'
csrf protection
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'
bug #17 fixed
Merge remote-tracking branch 'remotes/origin/master' into daniil

Conflicts:
	src/main/webapp/WEB-INF/jsp/bugs.jsp
	src/main/webapp/index.jsp