conflicts
Merge branch 'master2' of https://github.com/Paradigm-FGCU/bonsai.git
into master2

Conflicts:
	Bonsai/project.properties