fixed merge conflict
Merge branch 'updates' into cj_vertices
added vertex support
Merge branch 'cj_vertices' into updates

Conflicts:
	PioneersOfNeb/public_html/javascript/Tile.js