Add cakePHP to project
Fixed conflicts
Update .gitignore
Update .gitignore file
update security sult
Fixed date problem