Add service catalog feature
Updated key values
Merge branch 'master' into service-catalog
Update parent after release
Reversed debug commit
Fix #95.
Added an error message if JavaScript is disabled
Reverted a part of the last commit.
Fix #97. Add json error handling
Merge branch 'master' into service-catalog