Area merge test

This is getting an odd test failure due to a genre test:

```
../ruby-2.1.1/gems/activerecord-4.0.3/lib/active_record/relation/finder_methods.rb:266:in `find_with_ids': Couldn't find PulStore::Lae::Genre without an ID (ActiveRecord::RecordNotFound)
```
I'm not really sure where to take that one. Merge conflicts had to be resolved in the tests for the folder model and the folders controller params list.