Update controllers, models, views
Merge branch 'master' of https://github.com/diegoangel/cftest.git
asfasf