latest
latestMerge branch 'sprint2' of github.com:flowgrammable/flowsim into sprint2

Conflicts:
	flowsim-ui/app/scripts/controllers/profile.js
	flowsim-ui/app/scripts/services/profile.js
	flowsim-ui/app/views/profile/ports.html