gittest_two added newpage and modify about.java and contact.java
(master)
Merge branch 'master' into hugo_branch

Solve Conflicts:
	src/main/java/com/pech/tapestry/pages/About.java