refactored base structure and implemented log-in flow
Merge branch 'master' into administration-area