improved xhr json parsing
updated hard coded render order

..to be fixed
Merge branch 'develop' into gh-pages