Test merge of work

commit 341a8e456f8709b90b14efc99b0088f14613268e
Author: Quilmes <juan@fragmentlabs.com>
Date:   Fri Feb 7 11:54:37 2014 -0500

    Test #4

commit 4b894973f1a69831a7f6ee34baca90b4e41adb62
Author: Quilmes <juan@fragmentlabs.com>
Date:   Fri Feb 7 11:54:08 2014 -0500

    Test #3
Merge branch 'staging' of https://github.com/chronicinsomnia/CakePHP into staging