Merge branch 'master' of https://github.com/tiepvuvan/Matrimony

Conflicts:
	build/web/WEB-INF/tags/genericpage.tag
	web/WEB-INF/tags/genericpage.tag
update