Merge remote-tracking branch 'upstream/develop' into develop

fuck
Merge pull request #11 from Icarurs/develop

Move Postgres to Production group
images model
Merge pull request #12 from MarwanNakhaleh/develop

images model
Merge remote-tracking branch 'upstream/develop' into develop
kjdfjhgfds
Merge remote-tracking branch 'upstream/develop' into develop

i need the files
album model
Merge pull request #15 from MarwanNakhaleh/develop

album model and merge-remote crap that apparently shows up in here as well
relations on album
Merge remote-tracking branch 'upstream/develop' into develop

i need files br0
Merge pull request #16 from MarwanNakhaleh/develop

relations on album
Add sqlite and RSpec to the development and test groups