cleanup
Merge branch 'master' of https://github.com/matusn/Blue-Fire

Conflicts:
	examples/emptyExample/emptyExample.depend
	examples/emptyExample/emptyExample.layout