Fixed const error.
Added elements to JsonManager.
Added elements to JsonManager.
Merge branch 'stuart'
Fixing some bugs from my merge.