upload_cakephp
upload_all
upload_test
Merge branch 'master' of github.com:fixiecore/phper

Conflicts:
	application/core/ClassLoader.php
	application/core/UserRepository.php
upload_cakephp