update
Merge branch 'master' of https://github.com/tonysh518/malibu

Conflicts:
	protected/views/activities/contest.php
	protected/views/activities/video.php
	protected/views/index/index.php
	protected/views/layouts/activities_footer.php
	protected/views/layouts/footer.php
	protected/views/layouts/header.php
	protected/views/media/index.php
	protected/views/product/drink.php
	style/fontend/js/layer-v1.8.3/extend/layer.ext.js
	style/fontend/js/layer-v1.8.3/layer.min.js
	style/fontend/js/layer-v1.8.3/skin/layer.css
	style/fontend/js/layer-v1.8.3/skin/layer.ext.css
	style/fontend/js/main.js