Fixing merge conflicts.
Merge branch 'feature/sources-tab-for-catalog' of https://github.com/jeremyglasser/ddf-catalog into feature/sources-tab-for-catalog