wip
Merge branch '2.0' of https://github.com/familiar-studio/neota-craft into 2.0

Conflicts:
	public/styles/neota.css
Merge branch '2.0' of https://github.com/familiar-studio/neota-craft into 2.0