test commit 0.01
test
Merge branch 'master' of https://github.com/C2V3N/termin.git

Conflicts:
	termin-web/src/main/java/com/skubidu/termin/data/UserDAO.java
	termin-web/src/main/java/com/skubidu/termin/data/UserDAOImpl.java
	termin-web/src/main/java/com/skubidu/termin/service/UserServiceImpl.java