1.0!
Merge branch 'master' of https://github.com/leucinedreams/PharmGnome

Conflicts:
	PharmGnome/AndroidManifest.xml
	PharmGnome/res/values/strings.xml