Olivia updated to java 8, changed fxmldoc
Merge origin/master

Conflicts:
	.gitignore
Olivia changed background on looding screen