fixed warnings and formatting
formatted files
merged
formatting and imports
removed old species lists
fixed bug that caused NPE when creating non-pollard sightings introduced in #107
progress toward working photos, manager refactoring #10
Merge branch 'dev' of https://github.com/curtisullerich/butterflies into openweather

Conflicts:
	app/android/src/edu/iastate/ece/butterflies/activity/EditSightingActivity.java
	app/android/src/edu/iastate/ece/butterflies/activity/fragment/SurveyFragment.java
	app/android/src/edu/iastate/ece/butterflies/task/QuickAdder.java
	app/android/src/edu/iastate/ece/butterflies/util/ButterflyPreferences.java