提交未完成
Merge remote-tracking branch 'origin/master' into 20130522-2

Conflicts:
	frontend/app/js/custom.js
	frontend/page.html
完成基本布局循环
Merge branch '20130522-2'