Bug fix on checking if in dev
Tests failed fix
Merge branch 'aaron' of github.com:aloja/aloja into azureProd