Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

* 'master' of https://i61wiki.itec.uka.de/git/robot-api:
  ensured correct waiting behaviour on request and release
  Adjusted gitignore to new versions of qtcreator

Conflicts:
	source/RobotAPI/components/units/TCPControlUnit.cpp