Merge branch 'master' of https://github.com/vialab/SMT

Conflicts:
	src/vialab/SMT/Zone.java