add framework
Merge branch 'feature_framework' into develop

Conflicts:
	app/config/app.php
	app/controllers/index.php
	framework/core/App.php
	framework/core/Dispatcher.php
	framework/core/Loader.php
	index.php