Revert "playing around with property"

This reverts commit efc6be74cace5ab2f59d7053f83f4f8b8cbf22e8.

Conflicts:
	GUI/inputHandler.py
Merge remote-tracking branch 'origin/master'