on issue #19 - model created
#16
Merge remote-tracking branch 'origin/master'
on issue #19 - dao created
#15 fixed
Merge remote-tracking branch 'origin/master'
database connection properties moved to external file
fixed static resources path
bug fix
bug fixed
username instead of user_id in 'author' field of comment
Issue 7
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ru/hse/esadykov/controller/UsersController.java
	src/main/java/ru/hse/esadykov/dao/UserDao.java
todos
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'remotes/origin/master' into daniil

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