login.js
login.js
Mlerge branch 'master' of https://github.com/yakrsa/bismai

Conflicts:
	Data/conf/db.php