add layers and entities
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/images/layers.png