Merge branch 'master' of https://github.com/ardamoni/LRE

Conflicts:
	login2.php
Resolved conflict in Login2.php