Model ready to recieve DB.
Merge branch 'Database'
...
Merge branch 'master' into Database

Conflicts:
	src/com/asuscomm/mauker/db/MusicaDAO.java