Merge branch 'hotfix-1.0.3'
Merge branch 'hotfix-1.0.4'
Merge branch 'hotfix-1.0.5'
Merge branch 'release-1.1.0'
set next version
change hatena-blog rss from hatena-diary rss
change title and url from hatena-diary to hatena-blog
Merge branch 'hotfix-1.1.1' into develop

Conflicts:
	pom.xml
	war/WEB-INF/appengine-web.xml