Merge branch 'develop' of http://git.dev.yoho.cn/platform/yohobuy-portal-fe into develop

Conflicts:
	client/js/activity/edit.js
	client/js/activity/index.js
	client/package.json
	server/interface/activity.js
	server/views/pages/activity/edit.html

+{
+  "name": "yohobuy-portal",
+  "version": "0.2.1",
+  "description": "yohobuy-portal",
+  "keywords": [],
+  "homepage": "",
+  "author": "demo",
+  "repository": {
+    "type": "git",
+    "url": ""
+  },
+  "spm": {
+    "main": "index.js",
+    "dependencies": {
+      "jquery": "2.1.4",
+      "import-style": "1.0.0",
+      "yoho.handlebars": "3.0.3",
+      "yoho.bootstrap": "0.0.4"
+    },
+    "devDependencies": {
+      "expect.js": "0.3.1"
+    },
+    "buildArgs": "--idleading {{name}}"
+  },
+  "devDependencies": {
+    "crypto": "0.0.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "gulp": "^3.9.1",
+    "gulp-autoprefixer": "^3.1.0",
+    "gulp-clean": "^0.3.1",
+    "gulp-concat": "^2.6.0",
+    "gulp-develop-server": "^0.5.0",
+    "gulp-ftp": "^1.1.0",
+    "gulp-md5": "^0.1.2",
+    "gulp-minify-css": "^1.2.4",
+    "gulp-plumber": "^1.1.0",
+    "gulp-rename": "^1.2.2",
+    "gulp-sass": "^2.0.4",
+    "gulp-uglify": "^1.5.2",
+    "gulp-util": "^3.0.7",
+    "webpack": "^1.12.13"
+  },
+  "scripts": {
+    "test": "spm test",
+    "build": "spm build"
+  },
+  "main": "app.js",
+  "directories": {
+    "example": "examples",
+    "test": "tests"
+  },
+  "license": "ISC"
+}