Pulling some fixes from CodeCanvas
Using constants for locations
Adding checks for the constants already being defined
Merge branch 'feature/CleanUp' into develop
Merge branch 'develop' into feature/User