diego
Merge branch 'master' of https://github.com/srBruning/App-Blog/

Conflicts:
	MyBlog/WebContent/head_templeate.xhtml
	MyBlog/dist/MyBlog.war