First part of including sub-styles in form of Style/Substyle/Substyle2...
Merge branch 'master' of github.com:flack/openpsa