moved main project file and changed bin directory
Merge branch 'master' of https://github.com/OFFIS-Automation/Framework

Conflicts:
	modules/version/version.h