Resolve conflics
pull in updates
remove temp file
conflicts
Resolve conflicts
Add nav bar links
Only show manager and admin links if logged in user has permission
Update base URL ref
Uodate jQuery initialisation
Switch config path
Switch config path
Merge branch 'master' into activity
Change star hunt values
Fix create/update activity
Fix for issue #4
Change jQuery script load order.
Update news banner
Changed js base url
Fix activity filter from target view