.
Merge branch 'master' of https://github.com/danilomagalhaes/MusicBox.git

Conflicts:
	musicbox/musicbox.mv.db
	musicbox/src/main/java/musicbox/persistence/UserDao.java
	musicbox/src/main/webapp/WEB-INF/classes/musicbox/persistence/UserDao.class