javadocs de vertex updatejat
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Lots of changes to view layer and main, and things.
potato.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml