AnimalPictureController test fixed
AlbumControllerTest.java two tests added
Layout cleaning
Revert "Layout cleaning"

This reverts commit 4dafaaff3d8b24477f6a4b90b960ab935f78413e.
Merge remote-tracking branch 'origin/master' into enable_heroku_postgresql