Merge branch 'master' of https://github.com/albafica/module_demo

Conflicts:
	login/include/config.inc.php
	login/module/index/index.php
	login/module/login/include/login.ajax.php
	login/module/login/index.php
	login/templates/login/login.html