fix update code and add pdf support
fix merge conflicts
fix Gemfile.lock conflict
Really fix Gemfile.lock conflicts
Commit to make sure nested attributes have the attr_accessible permission
Merge branch 'master' into chris