dev commit
Merge branch 'develop' of https://github.com/nixfox/RPGnix