hgjgkjh
Merge remote-tracking branch 'origin/master'

Conflicts:
	mtg-web/src/main/webapp/WEB-INF/view/templates/navbar.jsp