add gallery to index
merge branch 'master' of github.com:lvwangbeta/sharetour

Conflicts:
	WebContent/edit.jsp
	WebContent/index.jsp
	WebContent/journal.jsp
	build/classes/com/sharetour/control/NewPostServlet.class
	build/classes/com/sharetour/model/Article.class
	src/com/sharetour/control/NewPostServlet.java
	src/com/sharetour/model/Article.java