just an major updat

Signed-off-by: velus <admin@velus.co.uk>
Merge branch 'Frozen' of https://github.com/velus/Aurora-WebUI into Frozen

Conflicts:
	www/javascripts/global.js