Fix Javascript styling.
Merge branch 'master' of github.com:mattdee123/wiki-graph

Conflicts:
	main/resources/static/js/controllers/base_controller.js
	main/resources/static/js/controllers/graph_controller.js
	main/resources/static/js/views/app.html
	main/resources/static/js/views/graph.html
	src/main/resources/static/js/controllers/base_controller.js
	src/main/resources/static/js/views/app.html
Merge branch 'master' of github.com:mattdee123/wiki-graph