added errors to error map, debug output, fixed compiler errors
Merge branch 'master' into marius

Conflicts:
	src/WeatherDataModel.cpp
	src/WeatherDataModel.hpp
Merge pull request #7 from tavaron/marius

Minor changes
resolved merge conflicts from strinstream bug work-around