Merge branch 'master' into 1.6

Conflicts:
	Croogo/Test/Case/View/Helper/CroogoFormHelperTest.php