resync
Merge branch 'master' of https://github.com/Anonyfox/waynamic

Conflicts:
	frontend/_public/js/vendor.js