Merge branch 'master' of github.com:vitriolix/mrapp into secureshare

Conflicts:
	app/AndroidManifest.xml
Merge branch 'master' into secureshare

Conflicts:
	.gitignore
	README.md
	scripts/copy-support-libs.sh
Merge branch 'master' into secureshare

Conflicts:
	README.md
removing .classpath; adding .classpath to gitignore
update android-ffmpeg-java peg to fix sox broken on arabic mode
bump to v0.0.8-build96
add jenkins script to a script in the local repo
make jenkins script executable
added classes and methods to support new table for storing account information
updated login page to store username/password in database
add some logging on db upgrades
finish integration of sqlcipher Auth table
Merge branch 'master' of github.com:guardianproject/storymaker
add helper to Auth to check for expired credentials; update ServerManager to check with Auth for expired credentials
updated cardsui repo
refactor db model to use base classes for Table and Model
more db refactoring; added ability to use ORM directly to db rather than using the Content Provider.  useful for migrations, tests and likely just faster in general.
fix db version back to 4 as it should be
fix some missing db only model paths
Merge branch 'master' into secureshare

Conflicts:
	README.md
	app/AndroidManifest.xml