Added images and cleaned up some tests
	new file:   app/views/photo_albums/index.html.erb
	new file:   app/views/photo_albums/show.html.erb
	new file:   db/migrate/.directory
	new file:   db/migrate/20131208014332_acts_as_commentable_upgrade_migration.disable
	new file:   db/migrate/20131215041741_create_spud_admin_permissions.spud_core.rb
	new file:   db/migrate/20131215041742_create_spud_users.spud_core.rb
	new file:   db/migrate/20131215041743_add_time_zone_to_spud_user.spud_core.rb
	new file:   db/migrate/20131215041744_add_scope_to_spud_admin_permissions.spud_core.rb
	new file:   db/migrate/20131215041745_create_spud_user_settings.spud_core.rb
	new file:   db/migrate/20131215041746_create_spud_photos.spud_photos.rb
	new file:   db/migrate/20131215041747_create_spud_photo_albums.spud_photos.rb
	new file:   db/migrate/20131215041748_create_spud_photo_galleries.spud_photos.rb
	new file:   db/migrate/20131215041749_upgrade_photo_relationships.spud_photos.rb
	new file:   db/migrate/20131215041750_rename_order_to_sort_order.spud_photos.rb
	new file:   public/.directory
	new file:   public/spud_photos/1/huge/plain-guitar2.jpg
	new file:   public/spud_photos/1/large/plain-guitar2.jpg
	new file:   public/spud_photos/1/medium/plain-guitar2.jpg
	new file:   public/spud_photos/1/original/plain-guitar2.jpg
	new file:   public/spud_photos/1/small/plain-guitar2.jpg
	new file:   public/spud_photos/1/spud_admin_medium/plain-guitar2.jpg
	new file:   public/spud_photos/1/spud_admin_small/plain-guitar2.jpg
	new file:   public/spud_photos/10/huge/electric4.jpg
	new file:   public/spud_photos/10/large/electric4.jpg
	new file:   public/spud_photos/10/medium/electric4.jpg
	new file:   public/spud_photos/10/original/electric4.jpg
	new file:   public/spud_photos/10/small/electric4.jpg
	new file:   public/spud_photos/10/spud_admin_medium/electric4.jpg
	new file:   public/spud_photos/10/spud_admin_small/electric4.jpg
	new file:   public/spud_photos/11/huge/electric5.jpg
	new file:   public/spud_photos/11/large/electric5.jpg
	new file:   public/spud_photos/11/medium/electric5.jpg
	new file:   public/spud_photos/11/original/electric5.jpg
	new file:   public/spud_photos/11/small/electric5.jpg
	new file:   public/spud_photos/11/spud_admin_medium/electric5.jpg
	new file:   public/spud_photos/11/spud_admin_small/electric5.jpg
	new file:   public/spud_photos/12/huge/bass1.png
	new file:   public/spud_photos/12/large/bass1.png
	new file:   public/spud_photos/12/medium/bass1.png
	new file:   public/spud_photos/12/original/bass1.png
	new file:   public/spud_photos/12/small/bass1.png
	new file:   public/spud_photos/12/spud_admin_medium/bass1.png
	new file:   public/spud_photos/12/spud_admin_small/bass1.png
	new file:   public/spud_photos/13/huge/bass2.jpg
	new file:   public/spud_photos/13/large/bass2.jpg
	new file:   public/spud_photos/13/medium/bass2.jpg
	new file:   public/spud_photos/13/original/bass2.jpg
	new file:   public/spud_photos/13/small/bass2.jpg
	new file:   public/spud_photos/13/spud_admin_medium/bass2.jpg
	new file:   public/spud_photos/13/spud_admin_small/bass2.jpg
	new file:   public/spud_photos/14/huge/bass3.jpg
	new file:   public/spud_photos/14/large/bass3.jpg
	new file:   public/spud_photos/14/medium/bass3.jpg
	new file:   public/spud_photos/14/original/bass3.jpg
	new file:   public/spud_photos/14/small/bass3.jpg
	new file:   public/spud_photos/14/spud_admin_medium/bass3.jpg
	new file:   public/spud_photos/14/spud_admin_small/bass3.jpg
	new file:   public/spud_photos/15/huge/bass4.jpg
	new file:   public/spud_photos/15/large/bass4.jpg
	new file:   public/spud_photos/15/medium/bass4.jpg
	new file:   public/spud_photos/15/original/bass4.jpg
	new file:   public/spud_photos/15/small/bass4.jpg
	new file:   public/spud_photos/15/spud_admin_medium/bass4.jpg
	new file:   public/spud_photos/15/spud_admin_small/bass4.jpg
	new file:   public/spud_photos/16/huge/bass5.jpg
	new file:   public/spud_photos/16/large/bass5.jpg
	new file:   public/spud_photos/16/medium/bass5.jpg
	new file:   public/spud_photos/16/original/bass5.jpg
	new file:   public/spud_photos/16/small/bass5.jpg
	new file:   public/spud_photos/16/spud_admin_medium/bass5.jpg
	new file:   public/spud_photos/16/spud_admin_small/bass5.jpg
	new file:   public/spud_photos/17/huge/jazz1.png
	new file:   public/spud_photos/17/large/jazz1.png
	new file:   public/spud_photos/17/medium/jazz1.png
	new file:   public/spud_photos/17/original/jazz1.png
	new file:   public/spud_photos/17/small/jazz1.png
	new file:   public/spud_photos/17/spud_admin_medium/jazz1.png
	new file:   public/spud_photos/17/spud_admin_small/jazz1.png
	new file:   public/spud_photos/18/huge/jazz2.jpg
	new file:   public/spud_photos/18/large/jazz2.jpg
	new file:   public/spud_photos/18/medium/jazz2.jpg
	new file:   public/spud_photos/18/original/jazz2.jpg
	new file:   public/spud_photos/18/small/jazz2.jpg
	new file:   public/spud_photos/18/spud_admin_medium/jazz2.jpg
	new file:   public/spud_photos/18/spud_admin_small/jazz2.jpg
	new file:   public/spud_photos/19/huge/jazz3.JPG
	new file:   public/spud_photos/19/large/jazz3.JPG
	new file:   public/spud_photos/19/medium/jazz3.JPG
	new file:   public/spud_photos/19/original/jazz3.JPG
	new file:   public/spud_photos/19/small/jazz3.JPG
	new file:   public/spud_photos/19/spud_admin_medium/jazz3.JPG
	new file:   public/spud_photos/19/spud_admin_small/jazz3.JPG
	new file:   public/spud_photos/2/huge/plain-guitar.jpg
	new file:   public/spud_photos/2/large/plain-guitar.jpg
	new file:   public/spud_photos/2/medium/plain-guitar.jpg
	new file:   public/spud_photos/2/original/plain-guitar.jpg
	new file:   public/spud_photos/2/small/plain-guitar.jpg
	new file:   public/spud_photos/2/spud_admin_medium/plain-guitar.jpg
	new file:   public/spud_photos/2/spud_admin_small/plain-guitar.jpg
	new file:   public/spud_photos/20/huge/jazz4.jpg
	new file:   public/spud_photos/20/large/jazz4.jpg
	new file:   public/spud_photos/20/medium/jazz4.jpg
	new file:   public/spud_photos/20/original/jazz4.jpg
	new file:   public/spud_photos/20/small/jazz4.jpg
	new file:   public/spud_photos/20/spud_admin_medium/jazz4.jpg
	new file:   public/spud_photos/20/spud_admin_small/jazz4.jpg
	new file:   public/spud_photos/21/huge/jazz5.jpg
	new file:   public/spud_photos/21/large/jazz5.jpg
	new file:   public/spud_photos/21/medium/jazz5.jpg
	new file:   public/spud_photos/21/original/jazz5.jpg
	new file:   public/spud_photos/21/small/jazz5.jpg
	new file:   public/spud_photos/21/spud_admin_medium/jazz5.jpg
	new file:   public/spud_photos/21/spud_admin_small/jazz5.jpg
	new file:   public/spud_photos/22/huge/diagram1.jpg
	new file:   public/spud_photos/22/large/diagram1.jpg
	new file:   public/spud_photos/22/medium/diagram1.jpg
	new file:   public/spud_photos/22/original/diagram1.jpg
	new file:   public/spud_photos/22/small/diagram1.jpg
	new file:   public/spud_photos/22/spud_admin_medium/diagram1.jpg
	new file:   public/spud_photos/22/spud_admin_small/diagram1.jpg
	new file:   public/spud_photos/23/huge/diagram2.jpg
	new file:   public/spud_photos/23/large/diagram2.jpg
	new file:   public/spud_photos/23/medium/diagram2.jpg
	new file:   public/spud_photos/23/original/diagram2.jpg
	new file:   public/spud_photos/23/small/diagram2.jpg
	new file:   public/spud_photos/23/spud_admin_medium/diagram2.jpg
	new file:   public/spud_photos/23/spud_admin_small/diagram2.jpg
	new file:   public/spud_photos/24/huge/diagram3.jpg
	new file:   public/spud_photos/24/large/diagram3.jpg
	new file:   public/spud_photos/24/medium/diagram3.jpg
	new file:   public/spud_photos/24/original/diagram3.jpg
	new file:   public/spud_photos/24/small/diagram3.jpg
	new file:   public/spud_photos/24/spud_admin_medium/diagram3.jpg
	new file:   public/spud_photos/24/spud_admin_small/diagram3.jpg
	new file:   public/spud_photos/25/huge/diagram4.jpg
	new file:   public/spud_photos/25/large/diagram4.jpg
	new file:   public/spud_photos/25/medium/diagram4.jpg
	new file:   public/spud_photos/25/original/diagram4.jpg
	new file:   public/spud_photos/25/small/diagram4.jpg
	new file:   public/spud_photos/25/spud_admin_medium/diagram4.jpg
	new file:   public/spud_photos/25/spud_admin_small/diagram4.jpg
	new file:   public/spud_photos/3/huge/classical1.jpg
	new file:   public/spud_photos/3/large/classical1.jpg
	new file:   public/spud_photos/3/medium/classical1.jpg
	new file:   public/spud_photos/3/original/classical1.jpg
	new file:   public/spud_photos/3/small/classical1.jpg
	new file:   public/spud_photos/3/spud_admin_medium/classical1.jpg
	new file:   public/spud_photos/3/spud_admin_small/classical1.jpg
	new file:   public/spud_photos/4/huge/classical2.jpg
	new file:   public/spud_photos/4/large/classical2.jpg
	new file:   public/spud_photos/4/medium/classical2.jpg
	new file:   public/spud_photos/4/original/classical2.jpg
	new file:   public/spud_photos/4/small/classical2.jpg
	new file:   public/spud_photos/4/spud_admin_medium/classical2.jpg
	new file:   public/spud_photos/4/spud_admin_small/classical2.jpg
	new file:   public/spud_photos/5/huge/classical3.jpg
	new file:   public/spud_photos/5/large/classical3.jpg
	new file:   public/spud_photos/5/medium/classical3.jpg
	new file:   public/spud_photos/5/original/classical3.jpg
	new file:   public/spud_photos/5/small/classical3.jpg
	new file:   public/spud_photos/5/spud_admin_medium/classical3.jpg
	new file:   public/spud_photos/5/spud_admin_small/classical3.jpg
	new file:   public/spud_photos/6/huge/classical4.jpg
	new file:   public/spud_photos/6/large/classical4.jpg
	new file:   public/spud_photos/6/medium/classical4.jpg
	new file:   public/spud_photos/6/original/classical4.jpg
	new file:   public/spud_photos/6/small/classical4.jpg
	new file:   public/spud_photos/6/spud_admin_medium/classical4.jpg
	new file:   public/spud_photos/6/spud_admin_small/classical4.jpg
	new file:   public/spud_photos/7/huge/electric1.jpg
	new file:   public/spud_photos/7/large/electric1.jpg
	new file:   public/spud_photos/7/medium/electric1.jpg
	new file:   public/spud_photos/7/original/electric1.jpg
	new file:   public/spud_photos/7/small/electric1.jpg
	new file:   public/spud_photos/7/spud_admin_medium/electric1.jpg
	new file:   public/spud_photos/7/spud_admin_small/electric1.jpg
	new file:   public/spud_photos/8/huge/electric2.jpg
	new file:   public/spud_photos/8/large/electric2.jpg
	new file:   public/spud_photos/8/medium/electric2.jpg
	new file:   public/spud_photos/8/original/electric2.jpg
	new file:   public/spud_photos/8/small/electric2.jpg
	new file:   public/spud_photos/8/spud_admin_medium/electric2.jpg
	new file:   public/spud_photos/8/spud_admin_small/electric2.jpg
	new file:   public/spud_photos/9/huge/electric3.jpg
	new file:   public/spud_photos/9/large/electric3.jpg
	new file:   public/spud_photos/9/medium/electric3.jpg
	new file:   public/spud_photos/9/original/electric3.jpg
	new file:   public/spud_photos/9/small/electric3.jpg
	new file:   public/spud_photos/9/spud_admin_medium/electric3.jpg
	new file:   public/spud_photos/9/spud_admin_small/electric3.jpg
	new file:   public/spud_photos/plain-guitar.jpg
	new file:   public/spud_photos/plain-guitar2.jpg#
Merge branch 'master-bu'
Merge branch 'dk-merge-with-master' into master-bu
Merge branch 'master-bu'
Merge branch 'master' into dm-working