qword
Merge branch 'master' of https://github.com/VladAbramov/forum

Conflicts:
	pom.xml
	sql/base.sql
	src/main/java/com/bsu/forum/access/AccessRight.java
	src/main/java/com/bsu/forum/controllers/FileController.java
	src/main/java/com/bsu/forum/controllers/LoginController.java
	src/main/java/com/bsu/forum/controllers/TopicController.java
	src/main/java/com/bsu/forum/controllers/UsersController.java
	src/main/java/com/bsu/forum/dao/FileDao.java
	src/main/java/com/bsu/forum/dao/MessageDao.java
	src/main/java/com/bsu/forum/dao/TopicDao.java
	src/main/java/com/bsu/forum/dao/UserDao.java
	src/main/java/com/bsu/forum/dao/impl/FileDaoImpl.java
	src/main/java/com/bsu/forum/dao/impl/MessageDaoImpl.java
	src/main/java/com/bsu/forum/dao/impl/TopicDaoImpl.java
	src/main/java/com/bsu/forum/dao/impl/UserDaoImpl.java
	src/main/java/com/bsu/forum/entity/File.java
	src/main/java/com/bsu/forum/entity/Message.java
	src/main/java/com/bsu/forum/entity/User.java
	src/main/java/com/bsu/forum/service/FileService.java
	src/main/java/com/bsu/forum/service/MessageService.java
	src/main/java/com/bsu/forum/service/TopicService.java
	src/main/java/com/bsu/forum/service/UserService.java
	src/main/java/com/bsu/forum/service/impl/FileServiceImpl.java
	src/main/java/com/bsu/forum/service/impl/MessageServiceImpl.java
	src/main/java/com/bsu/forum/service/impl/TopicServiceImpl.java
	src/main/java/com/bsu/forum/service/impl/UserServiceImpl.java
	src/main/java/com/bsu/forum/util/FileMeta.java
	src/main/java/com/bsu/forum/util/Thread.java
	src/main/java/com/bsu/forum/util/UserPosts.java
	src/main/java/com/bsu/forum/util/UserUtils.java
	src/main/java/com/bsu/forum/util/ViewURL.java
	src/main/resources/dataSource.xml
	src/main/resources/forum-security.xml
	src/main/resources/forum-servlet.xml
	src/main/resources/jdbc.properties
	src/main/resources/messages_en_US.properties
	src/main/resources/messages_ru_RU.properties
	src/main/webapp/WEB-INF/jsp/addNewTopic.jsp
	src/main/webapp/WEB-INF/jsp/editProfile.jsp
	src/main/webapp/WEB-INF/jsp/home.jsp
	src/main/webapp/WEB-INF/jsp/topic.jsp
	src/main/webapp/WEB-INF/jsp/users.jsp
	src/main/webapp/WEB-INF/tags/navbar.tag
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/assets/css/custom.css
	src/main/webapp/assets/js/jquery.fileupload.js
	src/main/webapp/assets/js/jquery.iframe-transport.js
	src/main/webapp/assets/js/jquery.ui.widget.js
Sql is modified
Final modifications