Changed ng-flow directory name and update config files.
Merge branch 'c1moore_branch' into dev