Javascript test
Merge branch 'master' of https://github.com/L6mps/PAGE

Conflicts:
	src/main/webapp/index.html