Merge branch 'dev' into dnd
- Issue sorting implemented.
- removed unnecessary nesting for ng-include.
Merge branch 'dnd' into dev