resolved java 1.7 errors
Merge branch 'master' of https://github.com/psmagicman/think-global-hack-local