Merge branch 'hotfix/1.5.7'
refactoring due to cakephp upgrade as side effect the ajax workflow failed, commit still contain commented code to ease review
add test for ProgramAuthComponent
remove commented code
change code layout
Merge branch 'hotfix/1.5.8' into develop