Merge branch 'integration'

Conflicts:
	ABOUT.md
Update .travis.yml
Update .travis.yml
re-adds openjdk7 build to travis config
Merge branch 'integration'

Conflicts:
	ABOUT.md