Merge remote-tracking branch 'origin/master'

Conflicts:
	Project/src/ConditionGenerator.java
Merge remote-tracking branch 'origin/detached'