merge-master-dev-lna

Conflicts:
	Simplanum Extension/js/c/login.js