Fuck you Java!
Merge branch 'master' of https://github.com/eddloggg/ashley

Conflicts:
	js/site.js
	parts/shared/header.php