Improvements to CLI interface
Added missing file
Merge branch 'master' of git://github.com/dkolbly/flowman

Conflicts:
	examples/pullq/cli/track.py
	examples/pullq/views.py
	src/server/dal.py
	src/www/generic.css
	src/www/index.html
	src/www/js/main.js