Widget custom update
Widget update
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	usr/module/widget/template/block/carousel/bootstrap.phtml
Wdiget carsouel update
Fix for carousel widget option load
Merge pull request #868 from sexnothing/develop

Widget carsouel update
Merge pull request #867 from linzongshu/develop

Fixed used namespace error of file service
Merge pull request #869 from linzongshu/develop

Fixed bug mentioned in issue #886 #865 #862
Search module update
Merge pull request #872 from sexnothing/develop

Search module update