Merge branch 'version1' into version2

Conflicts:
	static/less/style.less
	templates/layout/template.html
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from lynx1983/master

sortable patch