Working on updating the code to work with Cake3
Merge branch '3.0-develop' into develop