Simplified options menus as only one xml file is necessary now
Set project version to 0.3.1-BETA
Merge branch 'develop'