Changed some variable names
Merge branch 'develop' of github.com:henrikstranneheim/MIP into develop

Conflicts:
	intersectCollect.pl
manually fixed conflicts