gittest_one adding pech page (hugo_branch)
gittest_hugo_branch modify About.java (hugo_branch)
Merge branch 'master' into hugo_branch

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