transient added
Merge branch 'master' of https://github.com/LO23/BitMusic into stillEditing
Merge branch 'master' of https://github.com/LO23/BitMusic into stillEditing
Added implementation of addSong and deleteSong
Merge pull request #252 from Holywa/stillEditing

Still editing
Merge branch 'master' of https://github.com/LO23/BitMusic into JasyptLib

Conflicts:
	BitMusic/bitmusic/profile/api/ApiProfileImpl.java
	BitMusic/bitmusic/profile/classes/User.java