Merge branch 'master' of github.com:Whiley/WhileyCompiler

Conflicts:
	modules/wyc/src/wyc/testing/AllValidVerificationTests.java
Merge branch 'master' of github.com:Whiley/WhileyCompiler
WyC: not sure what happend, but something screwy happened with merging.