建立7/3 輪播圖
建立7/3
Test by Maki
Maki test
test
Merge branch 'master' of https://github.com/finpo/marryrice.git

Conflicts:
	marryrice/module/Application/view/application/index/index.phtml