moved custom settings templates to separate html files
Merge branch 'master' of github.com:DataTorrent/malhar-angular-dashboard

Conflicts:
	demo/scripts/demo.js
Merge pull request #90 from andyperlitch/master

moved custom settings templates to separate html files