Flytta over te nyeste version
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Admin.php
	AdminReferat.php
	AdminSaker.php
	AdminScript.php
	BrukerSaker.php
	CheckLogin.php
	EmailScript.php
	UserChoose.php
	UserReferat.php
	admin/AdminSelection.php
	driftmote/adminScript.php
	driftmote/databaseData.php
	driftmote/includes/foot.php
	index.php
	lol.php