Code layout changes
Code layout changes
If restrict locations floag is set then that usre can only view their location
New scripts from Phil
Fix branding issues
Merge pull request #151 from timschofield/develop

Develop