Ignore config.php
Fix .gitignore conflict
Recover test.php
Merge branch 'test' into devel
Remove test.php from master branch
Add validation for active locations
Add active field and validations
Add login error messages and login screen
Move login.html to login.php and add css
Merge devel