amol schaugn
Merge branch 'master' of https://github.com/andreaspfurtscheller/cube

Conflicts:
	settings/index.php
	templates/page-login.tpl