.
Merge remote-tracking branch 'origin/master'

Conflicts:
	UBlog/WebContent/index.jsp
dizaini isev shevcvale :D