Merge of new dispatch with management, relates to issue #23
- Merged angular and new dispatch.
- Issues with datasources list. @orjoola will address this issues.