editor structure
Merge branch 'master' of https://github.com/rinkevics/visand
additional rooms
Merge branch 'master' of https://github.com/rinkevics/visand

Conflicts:
	.sass-cache/0eb4b1cb25d728f339ee4e0b061d681f0da64bc3/main.sassc
	Production/editor/assets/css/main.css
	Production/editor/assets/images/sprites.png
	Production/editor/assets/sass/main.sass
	Production/editor/editor.html
	editor/Scripts.js
	editor/editor.html
	index.html
Merge branch 'master' of https://github.com/rinkevics/visand

Conflicts:
	.sass-cache/0eb4b1cb25d728f339ee4e0b061d681f0da64bc3/main.sassc
	Production/editor/assets/css/main.css
	Production/editor/assets/images/sprites.png
	Production/editor/assets/sass/main.sass
	Production/editor/editor.html
	editor/Scripts.js
	editor/editor.html
	index.html
Merge branch 'master' of https://github.com/rinkevics/visand

Conflicts:
	Production/editor/editor.html.orig
style update
Merge branch 'master' of https://github.com/rinkevics/visand

Conflicts:
	Production/editor/editor.html
	Production/editor/editor.html.orig
fix prices for new room types
Merge pull request #16 from rinkevics/master

pull