s
t
Merge branch 'master' of github.com:niles2005/mapflow

Conflicts:
	js/directives.js
	partials/compilePage.html
add directive for display level props
update