edit
edit
edit
edit
edit
Merge origin/master

Conflicts:
	TubesSimpleBlog2/src/java/Function/Komentar.java
	TubesSimpleBlog2/src/java/Function/ListKomentar.java
	TubesSimpleBlog2/src/java/Function/ListPost.java
	TubesSimpleBlog2/src/java/Function/NavigationController.java
	TubesSimpleBlog2/src/java/Function/User.java
	TubesSimpleBlog2/src/java/Function/UserManagement.java
	TubesSimpleBlog2/src/java/Function/ViewPost.java
	TubesSimpleBlog2/src/java/Servlet/ViewProfile.java
	TubesSimpleBlog2/web/Login.xhtml
	TubesSimpleBlog2/web/index.xhtml
	TubesSimpleBlog2/web/style.css
	TubesSimpleBlog2/web/updateuser.xhtml
	TubesSimpleBlog2/web/usermanagement.xhtml
	TubesSimpleBlog2/web/view_post.xhtml