urlbuilder done
Merge branch 'master' of https://github.com/szudvari/newtimedm

Conflicts:
	html.php