update Song Controller
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source
Code/src/ngo/music/soundcloudplayer/controller/SongController.java
update Song Constants