Merge branch 'dev' of

http://121.42.53.174:3000/bulomakaka/ekexiu.app.git into dev

Conflicts:
	app/html/moreItem.html

app/html/moreItem.html

@@ -32,7 +32,6 @@
				    </li>
				</ul>
			</div>
			
		</div>
		<div class="shareBlock" id="shareBlock">
			<h2 class="shareTit"><span>分享到</span></h2>