Fixed ambiguous argument problem when jdk 1.6 -> 1.7 (not fully tested)
Merge branch 'master' of github.com:FelipeLema/Expect-for-Java

Conflicts:
	com/github/ronniedong/Expect.java