API_URL
Fix lost channel sms parse
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/AndroidManifest.xml