untested skeleton of options stuff
Merge in master, resolve import conflicts
added options dispatching to options activity
Merge branch 'OptionsSkeleton' of github.com:johkelly/target_crusher into OptionsSkeleton
Add many icons. Add action bar items. Add action bar actions. MenuDisplayingActivity.