Project Builder and other improvments
Merge remote-tracking branch 'origin/master'

Conflicts:
	Mirage.pro