upload file to soundcloud
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source Code/AndroidManifest.xml
	Source
Code/src/ngo/music/soundcloudplayer/Adapters/OfflineSongAdapter.java
	Source
Code/src/ngo/music/soundcloudplayer/boundary/OfflineSongsFragment.java
	Source
Code/src/ngo/music/soundcloudplayer/controller/SongController.java