Updated location to require 100-meter accuracy and use network location service in tandem with GPS ala #46
#13 added action bar xmls #34 added rough draft of settings framework
Merge branch 'dev' of github.com:curtisullerich/butterflies into dev
Merge branch 'dev' of https://github.com/curtisullerich/butterflies into camdev
Commented out the import line since that file isn't present.