Added clock
Merge branch 'master' of github.com:ras0219/alphacomplex
Added simple animations via unsigned int animtime
Removed extern references to global city
Added uids for citizens
Merge remote-tracking branch 'jnstw/objectify' into jnstwpull
Removed City& argument to make_garbage_job
Make it compile on Visual Studio 2013
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/citizen.cpp
	src/entity.cpp