replace prxml with hiccup
Merge branch 'feature/no-prxml' into develop