Merge branch 'master' of https://git.oschina.net/sentcms/sentcms

# Conflicts:
#	application/common/view/default/ad/sider.html
#	core/convention.php
#	core/library/think/Route.php
#	core/library/think/Url.php

application/common/view/default/ad/sider.html

@@ -1,18 +0,0 @@
-<div class="banner">
-	<ul>
-		{volist name="ad" id="item"}
-		<li style="background:{$item['bgcolor']|default='#95FCBD'};" title="{$item['title']}">
-			<div class="body">
-				<div class="content">{$item['content']}</div>
-			</div>
-		</li>
-		{/volist}
-	</ul>
-</div>
-<script type="text/javascript">
-$(function() {
-    $('.banner').unslider({
-    	dots: true,               //  Display dot navigation
-    });
-});
-</script>