hacks & tricks
Merge branch 'master' of https://github.com/matrixx/meteorienteer

Conflicts:
	qt/Meteorienteer/main.cpp
	qt/Meteorienteer/taivaanvahti.h
	qt/Meteorienteer/taivaanvahtifield.h
Merge branch 'master' of https://github.com/matrixx/meteorienteer

Conflicts:
	qt/Meteorienteer/Meteorienteer.pro