implemented state_machine for the picture model (pending, rejected, approved)
fixed merge conflicts
Merge pull request #9 from radavis/state_machine

State machine