changed login to final database
Merge branch 'beta_01' of github.com:Schnullerpip/EDMA into beta_01

Conflicts:
	03_System/index.php