update
Merge branch 'master' of https://github.com/DreamToWin/funny

Conflicts:
	app/config/database.php
	app/config/packages/jasonlewis/basset/config.php
	app/controllers/BaseController.php
	app/helper.php
	app/routes.php
	app/views/backend/categories/create.blade.php
	app/views/backend/categories/edit.blade.php
	app/views/backend/categories/index.blade.php
	app/views/backend/dashboards/index.blade.php
	app/views/backend/users/create.blade.php
	app/views/backend/users/edit.blade.php
	app/views/backend/users/index.blade.php
	app/views/layouts/backend.blade.php
	composer.json
	public/.htaccess
	public/assets/builds/backend/assets/fonts/Descr.WD3
	public/assets/builds/backend/assets/fonts/fontawesome-webfont.svg
	public/assets/builds/backend/assets/fonts/fontawesome-webfontd41d.eot
	public/assets/builds/backend/assets/fonts/fontawesome-webfontf77b.eot
	public/assets/builds/backend/assets/fonts/fontawesome-webfontf77b.ttf
	public/assets/builds/backend/assets/fonts/fontawesome-webfontf77b.woff
	public/assets/builds/backend/assets/fonts/glyphicons-halflings-regular.eot
	public/assets/builds/backend/assets/fonts/glyphicons-halflings-regular.eot@
	public/assets/builds/backend/assets/fonts/glyphicons-halflings-regular.svg
	public/assets/builds/backend/assets/fonts/glyphicons-halflings-regular.ttf
	public/assets/builds/backend/assets/fonts/glyphicons-halflings-regular.woff
	public/assets/builds/backend/assets/fonts/glyphicons-halflings-regulard41d.eot
	public/assets/builds/backend/assets/img/404_icon.png
	public/assets/builds/backend/assets/img/500_icon.png
	public/assets/builds/backend/assets/img/Descr.WD3
	public/assets/builds/backend/assets/img/arrow-up.png
	public/assets/builds/backend/assets/img/avatar-mini.jpg
	public/assets/builds/backend/assets/img/avatar-mini2.jpg
	public/assets/builds/backend/assets/img/avatar-mini3.jpg
	public/assets/builds/backend/assets/img/avatar-mini4.jpg
	public/assets/builds/backend/assets/img/avatar1.jpg
	public/assets/builds/backend/assets/img/avatar1_small.jpg
	public/assets/builds/backend/assets/img/chart-texture.jpg
	public/assets/builds/backend/assets/img/chat-avatar.jpg
	public/assets/builds/backend/assets/img/chat-avatar2.jpg
	public/assets/builds/backend/assets/img/checkbox/check-off.png
	public/assets/builds/backend/assets/img/checkbox/check-on.png
	public/assets/builds/backend/assets/img/checkbox/radio-off.png
	public/assets/builds/backend/assets/img/checkbox/radio-on.png
	public/assets/builds/backend/assets/img/customSelect-arrow.gif
	public/assets/builds/backend/assets/img/favicon.html
	public/assets/builds/backend/assets/img/follower-avatar.jpg
	public/assets/builds/backend/assets/img/left-arrow.png
	public/assets/builds/backend/assets/img/mail-avatar.jpg
	public/assets/builds/backend/assets/img/mask.png
	public/assets/builds/backend/assets/img/pro-ac-1.png
	public/assets/builds/backend/assets/img/pro-ac-2.png
	public/assets/builds/backend/assets/img/product1.jpg
	public/assets/builds/backend/assets/img/product2.png
	public/assets/builds/backend/assets/img/product3.png
	public/assets/builds/backend/assets/img/profile-avatar.jpg
	public/assets/builds/backend/assets/img/right-arrow.png
	public/assets/builds/backend/assets/img/ring.jpg
	public/assets/builds/backend/assets/img/search-icon.jpg
	public/assets/builds/backend/assets/img/sm-img-1.jpg
	public/assets/builds/backend/assets/img/sm-img-2.jpg
	public/assets/builds/backend/assets/img/sm-img-3.jpg
	public/assets/builds/backend/assets/img/vector-lab.jpg
	public/assets/builds/backend/assets/js/jquery.confirm.min-5f48087edcf7d25c605b925d3f9dc068.js
	public/assets/css/backend-bootstrap-reset.css
	public/assets/css/backend-bootstrap.min.css
	public/assets/css/backend-style.css
	public/assets/fonts/fontawesome-webfont.svg
	public/assets/fonts/glyphicons-halflings-regular.eot
	public/assets/fonts/glyphicons-halflings-regular.svg
	public/assets/fonts/glyphicons-halflings-regular.ttf
	public/assets/fonts/glyphicons-halflings-regular.woff
	public/assets/js/bootbox.min.js
	public/assets/js/bootstrap-datapicker.js
	public/assets/js/bootstrap.min.js
	public/assets/js/dataTables.bootstrap.js
	public/assets/js/datatables.fnReloadAjax.js
	public/assets/js/jquery-ui-1.9.2.custom.min.js
	public/assets/js/jquery.colorbox-min.js
	public/assets/js/jquery.dataTables.min.js
	public/assets/js/jquery.js
	public/assets/js/jquery.nicescroll.js
	public/assets/js/jquery.scrollTo.min.js
	public/favicon.ico
	public/index.php
	public/packages/.gitkeep
	public/packages/zizaco/entrust/.gitkeep
	public/robots.txt
update