Merge branch '3.3/develop' into 3.3/master
Merge branch '3.3/develop' of github.com:kohana/kohana into 3.3/develop

* '3.3/develop' of github.com:kohana/kohana:
  Add phing to composer