Merge branch 'Mruocco-sortable-layout-tabs'
Merge branch 'master' of https://github.com/DataTorrent/malhar-angular-dashboard
Configurable Widget Demo (Custom Widget Settings Modal)
Merge branch 'master' of github.com:DataTorrent/malhar-angular-dashboard

Conflicts:
	demo/scripts/demo.js