small modifications
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/gihantharanga/visualizer into gihantharanga-master
changing tab names
Merge branch 'gihantharanga-master'
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/webapp/index.jsp
	src/main/webapp/view_graph.jsp
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/webapp/index.jsp
	src/main/webapp/view_graph.jsp
Merge remote-tracking branch 'upstream/master'
Merge pull request #41 from kkasunperera/master

resolving conflicts