Fixed merge
Merge branch 'master' of https://github.com/WiseLib/WiseLib
Removal of Angular '#' in urls and removed standard '.json' suffix