#13 added action bar xmls #34 added rough draft of settings framework
Merge branch 'dev' of github.com:curtisullerich/butterflies into dev