commit
Merge https://github.com/danielaliaga/QtUrban

Conflicts:
	UrbanSimulator/GeneratedFiles/ui_MyControlWidget.h
Update .gitignore to ignore GeneratedFiles directory.