Core
Merge branch 'master' of https://github.com/ArcherSys/ArcherSys

Conflicts:
	core/css/desktop.css
New: