small edits
Merge remote-tracking branch 'upstream/master'
small edits
Merge branch 'master' of https://github.com/gihantharanga/visualizer into gihantharanga-master

Conflicts:
	src/main/webapp/js/app.js
name changes
Merge pull request #46 from kkasunperera/master

merging and small edit to pull #45