add new files to makefile; fix g++ compatibility issue
change headers path
Merge branch 'dalerank' of https://github.com/gecube/opencaesar3 into vs2008-added

Conflicts:
 	city.cpp : resolved