seajs, require
合并异常修改
Merge branch 'master' of https://github.com/imvkmark/mark

Conflicts:
	static/less/mark.less