clean up android side
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.txt
	plugin.xml
	src/android/CloudFivePush.java
	www/CloudFivePush.js