Issues #49, #50 and #52
Merge branch 'master' into dev
Extended Fixture to support loading files into YAML fixtures
Ignoring temporary files ...
WIP issue #52
Merge branch 'master' into dev
Merge branch 'master' into dev
Revert "Added color to MiniTest output"

This reverts commit 3cc3d03beb11d4220af91d0ef072fac058b3c595.
Updated Paperclip to 2.7.1
Merge branch 'master' into dev
Revert "Updated Paperclip to 2.7.1"

This reverts commit 6bf2b3ddfbc0e1a3d1ad1f0dd284ff5298e9f19f.
Added unique indices to article HABTM tables
Issue #58
Issue #51
Merge branch 'master' into dev
Merge branch 'master' into dev

Conflicts:
	test/functional/ssl_requirements/articles_controller_test.rb
	test/functional/ssl_requirements/blog_controller_test.rb
	test/functional/ssl_requirements/categories_controller_test.rb
	test/functional/ssl_requirements/fair_dates_controller_test.rb
	test/functional/ssl_requirements/groups_controller_test.rb
	test/functional/ssl_requirements/picture_controller_test.rb
	test/functional/ssl_requirements/profiles_controller_test.rb
	test/functional/ssl_requirements/secure_user_requests_controller_test.rb
	test/functional/ssl_requirements/sessions_controller_test.rb
	test/functional/ssl_requirements/static_controller_test.rb
	test/unit/article_test.rb
	test/unit/color_test.rb
Merge branch 'master' into dev
Specified #to_param and ::from_param on Color and Material
WIP ArticleFeatureControllerTest
Issue #54