changed layout of pet_info
Merge branch 'master' of https://github.com/twuster/BlueprintHack
src/com/blueprint/blueprinthack/FacebookLoginFragment.java
fixed merge conflicts