FacebookAuthServlet.java completed, begin work on ItemServlet.java
Merge branch 'master' of https://github.com/L6mps/PAGE

Conflicts:
	src/main/webapp/js/testscripts.js