Made testPopulation compilable

In the commit before this one a new header was introduced,
types.h. It contains defines for data types which we may want to
change in the future.
Merge branch 'master' of https://github.com/abernatskiy/pdmmod

Conflicts:
	totalPopulation.cpp
	totalPopulation.h
Some order into the chaos of last merge + added testTotalPopulation