Minor changes.
Merge branch 'master' into javascript_interactive
Fixed a colouring bug with links

Links that were hovered while a link was selected stayed green.
Merge branch 'master' into javascript_interactive

Conflicts:
	src/main/java/g1/database/MainClass.java
Merge branch 'javascript_interactive'