standard
Merge branch 'inner' of https://github.com/talover/lesenca into inner

Conflicts:
	css/main.less
	img/pic_18.png
Merge branch 'master' into inner