Large Merge
Merge branch 'master' of https://github.com/domhanak/musicmanager

Conflicts:
	.idea/workspace.xml
	pom.xml
	src/main/java/cz/muni/fi/pv168/musicManager/Album.java
	src/main/java/cz/muni/fi/pv168/musicManager/AlbumManager.java
	src/main/java/cz/muni/fi/pv168/musicManager/AlbumManagerImpl.java
	src/test/java/cz/muni/fi/pv168/musicManager/AlbumManagerImplTest.java
	target/classes/cz/muni/fi/pv168/musicManager/AlbumManager.class
	target/classes/cz/muni/fi/pv168/musicManager/AlbumManagerImpl.class
	target/classes/cz/muni/fi/pv168/musicManager/SongManagerImpl.class
	target/test-classes/cz/muni/fi/pv168/musicManager/AlbumManagerImplTest.class