Merge branch 'master' of https://github.com/kebernet/gwittir

Conflicts:
	introspection/src/main/java/com/totsp/gwittir/introspection/IntrospectorFactory.java