Java 7
Merge branch 'master' of github.com:physion/ovation-docs

Conflicts:
	source/getting_started.rst