Linda Versi 1
merge
Merge origin/master

Conflicts:
	TubesSimpleBlog2/web/Login.xhtml
	TubesSimpleBlog2/web/index.xhtml
Merge origin/master

Conflicts:
	TubesSimpleBlog2/web/Login.xhtml
	TubesSimpleBlog2/web/index.xhtml