Fixed bug with favorites list.
Merge branch 'dev' of github.com:curtisullerich/butterflies into dev
Merge branch 'dev' of https://github.com/curtisullerich/butterflies into camdev
Started functionality for to adding temperature to a survey.
Updated the actual database object to include the unknown listings.
Merge branch 'dev' of https://github.com/curtisullerich/butterflies into camdev
Created list family divider logic. #90
Merge branch 'dev' of github.com:curtisullerich/butterflies into dev
Finished issue #90.
Updated to handle unknown family. #90.
Added Breadcrumbing service. #72
removed FusedLocationBreadcrumber. #72
finished breadcrumbing as a service, and associated lifecycle tweaks. Fixed bugs with notifications. #72
Merge branch 'dev' of github.com:curtisullerich/butterflies into dev
Finished adding the temperature for the survey editing page. The form will display the stored temperature in either Fahrenheit or celsius, depending on the setting in the settings page. I also added an option on the settings page for users to be able to choose which format they want to use. The survey database has also been updated to handle storing this new data value. #91 #78
Merge branch 'dev' of https://github.com/curtisullerich/butterflies into camdev

Conflicts:
	app/android/src/edu/iastate/ece/butterflies/activity/SurveyFragment.java