admin
Merge branch 'develop'

Conflicts:
	demo-war/src/main/java/com/pscuderi/appengineangulardemo/servlet/AdminServlet.java