Save&Load
Entity eddited
Merge branch 'master' of https://github.com/Asmayra/SoPra

Conflicts:
	SoPra/src/org/model/Playlist.java
	SoPra/src/org/model/Song.java
	SoPra/src/org/model/StandardUser.java