framework update
Merge branch 'master' of github.com:JanHuang/Framework

Conflicts:
	README.md
	framework/seed/apps/Demo/Config/Config.php
	framework/seed/apps/Demo/Config/Route.php
	framework/seed/config/config.php
	framework/seed/config/database.php
	framework/seed/config/route.php
	framework/seed/public/index.php
	framework/seed/vendor/seed/autoload/ClassLoader.php
	framework/seed/vendor/seed/route/Route.php
	framework/seed/vendor/service/pagination/Pagination.php