Commit before Pull Major
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/evo/evocate/data/DALocal.java