Add model classes
Some updates in jsp files
Merge branch 'master' of https://github.com/ComNA/bonfire
Merge branch 'master' of https://github.com/ComNA/bonfire