Merge branch 'master' of https://github.com/nkurinsky/SurveySim

Conflicts:
	trunk/src/functions.cpp
	trunk/src/functions.h
	trunk/src/simulator.cpp