refactored some model classes
Merge branch 'master' into photoPicker