navbar
Merge remote-tracking branch 'origin/master'

Conflicts:
	module/User/view/layout/layout.phtml
Merge branch 'master' of https://github.com/TeamHangLoose/sa2014