Merge remote-tracking branch 'origin/master'

Conflicts:

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/EditView.class

	MusicSalvationSDKVerson/bin/classes/com/LLC/MusicSelvation/MainActivity.class