Merge branch 'master' of https://github.com/QuantumBadger/RedReader into v2

Conflicts:
	AndroidManifest.xml
	pom.xml