Merge branch 'feature-env-vars' of github.com:mikepatt76/vfa-placement-portal into staging
Merge branch 'fix-remember-token' of github.com:mikepatt77/vfa-placement-portal into staging
removed adminrules from base
replaced tabs with spaces
Merge pull request #152 from mikepatt77/cleaning

Cleaning: tabs to spaces
Merge pull request #153 from mikepatt77/staging

Staging