Finished the automated schema updates for the application. The app will now use the onUpgrade functoinality within Android to control know how the update gets applied. #89
Merge branch 'dev' of https://github.com/curtisullerich/butterflies into camdev
Started functionality for to adding temperature to a survey.
Merge branch 'dev' of https://github.com/curtisullerich/butterflies into camdev
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
Added some finishing touches to the temperature field. I fixed an edge case that allowed for the temperature value to be altered through the use of the settings menu. This has been fixed. #78 #91