phase2/oa_core — pull request #7 by scottalan (2014-01-30 18:04:55+00:00)
Title: Resolves a conflict between OA Users and Panopoly Users.

`oa_users` depends on `oa_panopoly_users` and `oa_panopoly_users` depends on `panopoly_users` so it automatically gets
```
features[field_instance][] = user-user-field_user_about
features[field_instance][] = user-user-field_user_picture
```
This resolves the conflict between `oa_users` and `panopoly_users`