Cleaning House, and changing buttons to TextViews
Minor changes
Work in progress commit
Merge remote-tracking branch 'origin/Camera-Pretty-Branch'

forced commit to merge

Conflicts:
	Plant_Track/gen/edu/drake/pocketbotanist/R.java
	Plant_Track/res/drawable/entry_small.png
	Plant_Track/res/drawable/map_small.png
	Plant_Track/res/drawable/search_small.png
	Plant_Track/res/layout/activity_entry_screen.xml
	Plant_Track/res/menu/activity_home_screen.xml
	Plant_Track/src/edu/drake/pocketbotanist/EntryScreen.java
	Plant_Track/src/edu/drake/pocketbotanist/Entrymap_1_3.java