Grab gitignore from another branch
Remove default status from featured_comments table
Allow array of properties to be passed into shared resource controller specs
Add some space below status dropdown
Merge remote-tracking branch 'origin/master' into association-versioning

Conflicts:
	spec/support/shared_examples/shared_resource_controller_specs.rb