Update to the GUI
Git issues
Merge branch 'master' of https://github.com/gamepopper/TeamSkyrail-GGJ2014

Conflicts:
	Assets/City.unity