Minor ui fixes, changed login page colour, also minor java fix.
Merge commit 'ecc2619a481bc999400eb452979025f4c4c80bff'

Conflicts:
	src/main/java/com/uvic/textshare/service/matching/MatchingFunction.java
Merge branch 'master' of https://github.com/Brkk/textchanger
updated login page icon