Merge branch 'cakephp2.0'
2x release + notes