small set of changes
Merge branch 'master' of https://github.com/gihantharanga/visualizer into gihantharanga-master

Conflicts:
	src/main/webapp/js/app.js
Merge branch 'master' of https://github.com/gihantharanga/visualizer into gihantharanga-master

Conflicts:
	src/main/webapp/js/app.js
Merge branch 'master' of https://github.com/gihantharanga/visualizer into gihantharanga-master

Conflicts:
	src/main/webapp/js/app.js
Merge branch 'master' of https://github.com/gihantharanga/visualizer into gihantharanga-master

Conflicts:
	src/main/webapp/js/app.js
Merge branch 'gihantharanga-master'
Merge branch 'master' of https://github.com/gihantharanga/visualizer into gihantharanga-master

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

resolve conflicts
some commit
Merge branch 'master' of
https://github.com/Karsha-Project-LSF/visualizer.git

Conflicts:
	src/main/webapp/Quater_view.jsp
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/js/app.js
	src/main/webapp/json/data2005.json