App updates
Merge branch 'master' of https://github.com/banilotpal/visualflowchart

Conflicts:
	assets/js/app/app.js