Frame some div/images
Merge branch 'master' of github.com:teampopong/polidic

Conflicts:
	static/less/layout.less