update framework files
Merge branch 'master' of https://github.com/qk31/vvvv

Conflicts:
	app/config/app.php
update framwork files