Bugfix in models
JS fixes
Merge branch 'master' of github.com:PatrickMcSweeny/Sportal