add login
Merge remote-tracking branch 'origin/master' into login

Conflicts:
	config.py
	environment.sh
Merge pull request #48 from LandRegistry/login

add login