updating peg for android-ffmpeg-java
pull auth fixes from secureshare into master
bump to v0.0.10-build118
Merge branch 'master' into secureshare

Conflicts:
	app/AndroidManifest.xml
	app/src/info/guardianproject/mrapp/model/Auth.java