Fixed the dependent library problem on Windows 7
Merge branch 'master' of https://github.com/epfl-lara/ScalaZ3

Conflicts:
	src/main/java/z3/Z3Wrapper.java