merge
Merge branch 'dev' of https://github.com/genericsystem/genericsystem2014.git into dev
Upgrade javassist for support java 8 default interfaces