Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/unishare.apk
	gen/com/example/unishare/R.java
Merge branch 'master' of https://github.com/Mastercava/unishare