merged in fix for gh-pages JSON parsing error
Merge branch 'develop'