made 'more' button fill
Merge branch 'dev' of github.com:curtisullerich/butterflies into dev
added new survey types
fixed NPE for devices without environment sensors
fixed bugs resulting from improper input handling
merged with cameron
ui tweaks and bug fixes
added environment sensor support for display
updated manifest for alpha release