rebuild path
rebuild path
remove vendor
fix
Merge branch 'luxurioust#1' into develop
Merge branch 'Cui' of github.com:TrustWorty/pinai into develop

Conflicts:
	README.md
	code/public/css/nav.css
	code/public/font-awesome-4.1.0/.DS_Store
	code/public/font-awesome-4.1.0/css/.DS_Store
	code/public/font-awesome-4.1.0/css/font-awesome.css
	code/public/font-awesome-4.1.0/css/font-awesome.min.css
	code/public/font-awesome-4.1.0/fonts/FontAwesome.otf
	code/public/font-awesome-4.1.0/fonts/fontawesome-webfont.eot
	code/public/font-awesome-4.1.0/fonts/fontawesome-webfont.svg
	code/public/font-awesome-4.1.0/fonts/fontawesome-webfont.ttf
	code/public/font-awesome-4.1.0/fonts/fontawesome-webfont.woff
	code/public/font-awesome-4.1.0/less/bordered-pulled.less
	code/public/font-awesome-4.1.0/less/core.less
	code/public/font-awesome-4.1.0/less/fixed-width.less
	code/public/font-awesome-4.1.0/less/font-awesome.less
	code/public/font-awesome-4.1.0/less/icons.less
	code/public/font-awesome-4.1.0/less/larger.less
	code/public/font-awesome-4.1.0/less/list.less
	code/public/font-awesome-4.1.0/less/mixins.less
	code/public/font-awesome-4.1.0/less/path.less
	code/public/font-awesome-4.1.0/less/rotated-flipped.less
	code/public/font-awesome-4.1.0/less/spinning.less
	code/public/font-awesome-4.1.0/less/stacked.less
	code/public/font-awesome-4.1.0/less/variables.less
	code/public/font-awesome-4.1.0/scss/_bordered-pulled.scss
	code/public/font-awesome-4.1.0/scss/_core.scss
	code/public/font-awesome-4.1.0/scss/_fixed-width.scss
	code/public/font-awesome-4.1.0/scss/_icons.scss
	code/public/font-awesome-4.1.0/scss/_larger.scss
	code/public/font-awesome-4.1.0/scss/_list.scss
	code/public/font-awesome-4.1.0/scss/_mixins.scss
	code/public/font-awesome-4.1.0/scss/_path.scss
	code/public/font-awesome-4.1.0/scss/_rotated-flipped.scss
	code/public/font-awesome-4.1.0/scss/_spinning.scss
	code/public/font-awesome-4.1.0/scss/_stacked.scss
	code/public/font-awesome-4.1.0/scss/_variables.scss
	code/public/font-awesome-4.1.0/scss/font-awesome.scss
	code/public/img/nav_bg.png
	code/public/img/nav_main_bg.png
	code/public/js/jquery-1.11.1.min.js
	code/public/js/jquery.scrollto.js
	code/public/js/nav.js
	code/个人信息页面/img/hert.png
	code/找回密码/css/style.css
	code/缘来在这/Images/arrow.png
	code/缘来在这/Images/boy.png
	code/缘来在这/Images/filt.png
	code/缘来在这/Images/user_1.png
	code/缘来在这/css/style.css
	code/首页/Images/boy.jpg
	code/首页/Images/boy.png
	code/首页/Images/girl.png
	code/首页/Images/love.png
	code/首页/Images/xin1.png
	code/首页/Images/xin2.png
	code/首页/Images/xin3.png
	code/首页/Js/main.js
	code/首页/css/style.css
	code/首页/index.html
	laravel/app/views/home/.DS_Store
	laravel/public/assets/font-awesome-4.1.0/css/font-awesome.css
	laravel/public/assets/font-awesome-4.1.0/css/font-awesome.min.css
	laravel/public/assets/font-awesome-4.1.0/fonts/FontAwesome.otf
	laravel/public/assets/font-awesome-4.1.0/fonts/fontawesome-webfont.eot
	laravel/public/assets/font-awesome-4.1.0/fonts/fontawesome-webfont.svg
	laravel/public/assets/font-awesome-4.1.0/fonts/fontawesome-webfont.ttf
	laravel/public/assets/font-awesome-4.1.0/fonts/fontawesome-webfont.woff
	laravel/public/assets/font-awesome-4.1.0/less/bordered-pulled.less
	laravel/public/assets/font-awesome-4.1.0/less/core.less
	laravel/public/assets/font-awesome-4.1.0/less/fixed-width.less
	laravel/public/assets/font-awesome-4.1.0/less/font-awesome.less
	laravel/public/assets/font-awesome-4.1.0/less/icons.less
	laravel/public/assets/font-awesome-4.1.0/less/larger.less
	laravel/public/assets/font-awesome-4.1.0/less/list.less
	laravel/public/assets/font-awesome-4.1.0/less/mixins.less
	laravel/public/assets/font-awesome-4.1.0/less/path.less
	laravel/public/assets/font-awesome-4.1.0/less/rotated-flipped.less
	laravel/public/assets/font-awesome-4.1.0/less/spinning.less
	laravel/public/assets/font-awesome-4.1.0/less/stacked.less
	laravel/public/assets/font-awesome-4.1.0/less/variables.less
	laravel/public/assets/font-awesome-4.1.0/scss/_bordered-pulled.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_core.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_fixed-width.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_icons.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_larger.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_list.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_mixins.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_path.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_rotated-flipped.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_spinning.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_stacked.scss
	laravel/public/assets/font-awesome-4.1.0/scss/_variables.scss
	laravel/public/assets/font-awesome-4.1.0/scss/font-awesome.scss
	laravel/public/assets/js/jingling.js
	laravel/public/assets/js/jquery-1.11.1.min.js
	static/css/fatehere.css
	static/css/font-awesome-4.1.0/.DS_Store
	static/css/font-awesome-4.1.0/css/.DS_Store
	static/css/font-awesome-4.1.0/css/font-awesome.css
	static/css/font-awesome-4.1.0/css/font-awesome.min.css
	static/css/font-awesome-4.1.0/fonts/FontAwesome.otf
	static/css/font-awesome-4.1.0/fonts/fontawesome-webfont.eot
	static/css/font-awesome-4.1.0/fonts/fontawesome-webfont.svg
	static/css/font-awesome-4.1.0/fonts/fontawesome-webfont.ttf
	static/css/font-awesome-4.1.0/fonts/fontawesome-webfont.woff
	static/css/font-awesome-4.1.0/less/bordered-pulled.less
	static/css/font-awesome-4.1.0/less/core.less
	static/css/font-awesome-4.1.0/less/fixed-width.less
	static/css/font-awesome-4.1.0/less/font-awesome.less
	static/css/font-awesome-4.1.0/less/icons.less
	static/css/font-awesome-4.1.0/less/larger.less
	static/css/font-awesome-4.1.0/less/list.less
	static/css/font-awesome-4.1.0/less/mixins.less
	static/css/font-awesome-4.1.0/less/path.less
	static/css/font-awesome-4.1.0/less/rotated-flipped.less
	static/css/font-awesome-4.1.0/less/spinning.less
	static/css/font-awesome-4.1.0/less/stacked.less
	static/css/font-awesome-4.1.0/less/variables.less
	static/css/font-awesome-4.1.0/scss/_bordered-pulled.scss
	static/css/font-awesome-4.1.0/scss/_core.scss
	static/css/font-awesome-4.1.0/scss/_fixed-width.scss
	static/css/font-awesome-4.1.0/scss/_icons.scss
	static/css/font-awesome-4.1.0/scss/_larger.scss
	static/css/font-awesome-4.1.0/scss/_list.scss
	static/css/font-awesome-4.1.0/scss/_mixins.scss
	static/css/font-awesome-4.1.0/scss/_path.scss
	static/css/font-awesome-4.1.0/scss/_rotated-flipped.scss
	static/css/font-awesome-4.1.0/scss/_spinning.scss
	static/css/font-awesome-4.1.0/scss/_stacked.scss
	static/css/font-awesome-4.1.0/scss/_variables.scss
	static/css/font-awesome-4.1.0/scss/font-awesome.scss
	static/css/getPasswordBack.css
	static/css/index.css
	static/css/nav.css
	static/images/arrow.png
	static/images/boy.jpg
	static/images/boy.png
	static/images/filt.png
	static/images/girl.png
	static/images/hert.png
	static/images/love.png
	static/images/nav_bg.png
	static/images/nav_main_bg.png
	static/images/symbol.png
	static/images/user_1.png
	static/images/xin1.png
	static/images/xin2.png
	static/images/xin3.png
	static/index.html
	static/index/Images/boy.jpg
	static/index/Images/boy.png
	static/index/Images/girl.png
	static/index/Images/love.png
	static/index/Images/xin1.png
	static/index/Images/xin2.png
	static/index/Images/xin3.png
	static/index/Js/main.js
	static/index/css/style.css
	static/index/index.html
	static/js/index.js
	static/js/jquery-1.11.1.min.js
	static/js/jquery.scrollto.js
	static/js/nav.js
	static/password/css/style.css
	static/password/fotgetPassWord.html
	static/profile/img/321321.jpg
	static/profile/img/about.png
	static/profile/img/app.png
	static/profile/img/b.jpg
	static/profile/img/contentbg.jpg
	static/profile/img/fome.png
	static/profile/img/g.jpg
	static/profile/img/hert.png
	static/profile/img/message.png
	static/profile/img/peo.png
	static/profile/img/scale.png
	static/profile/img/xin.png
	static/profile/img/zl.png
	static/profile/index.html
	static/profile/main.js
	static/profile/style.css
	static/public/css/nav.css
	static/public/font-awesome-4.1.0/.DS_Store
	static/public/img/321321.jpg
	static/public/img/b.jpg
	static/public/img/g.jpg
	static/public/img/nav_bg.png
	static/public/img/nav_main_bg.png
	static/public/img/新建文件夹/aquarius.png
	static/public/img/新建文件夹/aries.png
	static/public/img/新建文件夹/cancer.png
	static/public/img/新建文件夹/capricorn.png
	static/public/img/新建文件夹/gemini.png
	static/public/img/新建文件夹/leo.png
	static/public/img/新建文件夹/libra.png
	static/public/img/新建文件夹/pisces.png
	static/public/img/新建文件夹/sagittarius.png
	static/public/img/新建文件夹/scorpio.png
	static/public/img/新建文件夹/taurus.png
	static/public/img/新建文件夹/virgo.png
	static/public/js/DD_belatedPNG_0.0.8a.js
	static/public/js/color.js
	static/public/js/html5shiv.js
	static/public/js/jquery.scrollto.js
	static/public/js/nav.js
	static/show/Images/arrow.png
	static/show/Images/boy.jpg
	static/show/Images/boy.png
	static/show/Images/filt.png
	static/show/Images/girl.png
	static/show/Images/hert.png
	static/show/Images/user_1.png
	static/show/css/style.css
	static/show/index.html
new branch add
aaa
delete readme
add preInfoEdit
update 2014-11-11
test
update