Changed options on picture

Found it to be nearly impossible to return an image uri from a custom
scanned gallery, instead has a view image section, and will soon be able
to swipe to change showcased picture.
Cleaned House a little bit

Removed extra unused files
commit after apk export
Took out unnecessary TODO
Merge branch 'master' of https://github.com/vsdragon626/Botany_App

Work in progress commit

Conflicts:
	Plant_Track/gen/edu/drake/pocketbotanist/R.java
	Plant_Track/src/edu/drake/pocketbotanist/EntryScreen.java