Merge branch 'master' of https://github.com/mockito/mockito

Conflicts:
	src/org/mockito/Mockito.java
	src/org/mockito/verification/Timeout.java