Coming together
Merge branch 'feature/simple_auth' into develop