Merge branch 'master' of git.pagodabox.com:phpfinansist
Merge branch 'master' into public_protected_path