Initial commit
Merge branch 'dev'
Merge branch 'dev'
Moved source editing to it's own controller for all sources.