Javadoc update
Merge branch 'master' of https://github.com/Albex/albex.github.io

Conflicts:
	JLps/index.html