Merge pull request #52 from calblueprint/jason_formlayouts

Lots of layout things
fix logging bug in main activity
Merge pull request #57 from calblueprint/services

fix logging bug in main activity
service array call from main activity
Merge branch 'master' of https://github.com/calblueprint/PHC into services
Merge pull request #65 from calblueprint/services

Services
Clean up PHC rails
Merge pull request #70 from calblueprint/howard/clean_rails

Clean up PHC rails
fixed merge conflict