Fiddling around with header inclusion / mapserver linking
Merge remote-tracking branch 'origin/master'

Conflicts:
	mainwindow.cpp
	mainwindow.h
	mapfileparser.h