Merge branch 'dev'

Conflicts:
	README.md

Author: taylorchen709

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016-present taylorchen709
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -22,11 +22,13 @@ npm run build
 Modern browsers and Internet Explorer 10+.
 
 ### snapshots
-![image](https://github.com/taylorchen709/vueAdmin/blob/master/screenshots/login.png)
-![image](https://github.com/taylorchen709/vueAdmin/blob/master/screenshots/main.png)
-![image](https://github.com/taylorchen709/vueAdmin/blob/master/screenshots/edit.jpg)
+![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/login.png)
+![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/main.png)
+![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/edit.jpg)
 
 ### wechat group（加不进时请扫我）
 ![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/vueadmin/code.jpg)
 ![image](https://raw.githubusercontent.com/taylorchen709/markdown-images/master/mywechatid.jpg)
 
+### License
+[MIT](http://opensource.org/licenses/MIT)

package.json

@@ -29,7 +29,7 @@
     "chalk": "^1.1.3",
     "connect-history-api-fallback": "^1.1.0",
     "css-loader": "^0.26.1",
-    "element-ui": "^1.1.5",
+    "element-ui": "^1.1.6",
     "eventsource-polyfill": "^0.9.6",
     "express": "^4.13.3",
     "extract-text-webpack-plugin": "^1.0.1",