Merge branch 'master' of https://github.com/ranacseruet/ultra

Conflicts:
	header.php