Allow inflating multiple option xml files
Set project version to 0.3.5-BETA
Updated version references
Merge branch 'develop'