alt
Merge branch 'master' of https://github.com/paulavo/Project3

Conflicts:
	build/generated-sources/ap-source-output/entities/Music_.java
	build/generated-sources/ap-source-output/entities/Playlist_.java
	build/generated-sources/ap-source-output/entities/User_.java
	build/web/WEB-INF/classes/manager/bean/ManagerPlayList.class
	dist/Project3.war