Now testing for java 7 or 8. Edited the documentation to reflect these change and refresh it a bit.
Java version to 1.7 and Jmol/JSmol FAQ update
Merge branch 'u/fbissey/java-1.7' of git://trac.sagemath.org/sage into develop

Conflicts:
	src/doc/en/faq/faq-usage.rst
#17290 : fix typo in linear_programming.rst
Incorporate Karl-Dieter's comment about a newline.
Trac #17279: Fix java version detection

Since the Java requirements have gone up, the version detection in
`src/sage/interfaces/jmoldata.py` should be fixed.

URL: http://trac.sagemath.org/17279
Reported by: jdemeyer
Ticket author(s): François Bissey, Jonathan Gutow
Reviewer(s): Karl-Dieter Crisman
Trac #17290: Fix a typo in Linear Programming thematic tutorial

The first example of the "Linear Programming" thematic tutorial deals
with maximizing `x+y−3z` and actually maximizes `x+y+3z`, sometimes
causing troubles to newcomers.

URL: http://trac.sagemath.org/17290
Reported by: tmonteil
Ticket author(s): Thierrry Monteil
Reviewer(s): Nathann Cohen