.
.
Merge branch 'master' of https://github.com/ladabil/simuleringGUI.git

Conflicts:
	hidden/Site.class.inc.php