Incremented version number, added to changelog
Merge branch 'jonahbron-master' of github.com:sy4mil/Options-Framework into jonahbron-master