Minor fixes
Merge branch 'master' of https://github.com/flowgrammable/flowsim

Conflicts:
	flowsim-ui/app/scripts/controllers/simulation.js
Merge branch 'master' of https://github.com/flowgrammable/flowsim
Merge branch 'master' of https://github.com/flowgrammable/flowsim

Conflicts:
	flowsim-ui/app/scripts/controllers/simulation.js
Merge branch 'master' of https://github.com/flowgrammable/flowsim

Conflicts:
	flowsim-ui/app/index.html
Merge branch 'master' of https://github.com/flowgrammable/flowsim
Merge branch 'master' of https://github.com/flowgrammable/flowsim

Conflicts:
	flowsim-ui/app/index.html