new post
Merge remote-tracking branch 'origin/source' into source

Conflicts:
	source/_posts/2014-03-10-how-to-start-writing-a-java-web-application-maven-archetype-webapp.markdown
add <!--more-->