test
UserDAO
New DAO
Merge branch 'master' of git@github.com:Faustyachka/Zephyrus.git

Conflicts:
	WebContent/WEB-INF/web.xml
	src/com/zephyrus/wind/dao/interfaces/IUserDAO.java
	src/com/zephyrus/wind/enums/Pages.java
	src/com/zephyrus/wind/managers/CommandManager.java