aanpassing
Merge branch 'master' of https://github.com/sthz/Noxia_Pro

Conflicts:
	Projectpy27.py
Merge branch 'master' of https://github.com/sthz/Noxia_Pro