user  and mobile style
user  and mobile style
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/css/layout/_layout.css
	src/main/webapp/page/layout/_layout.ftl