Revert "Merge conflicts"

This reverts commit 97a864c7671d27c03cdb19007a2fd20c5c1080f8, reversing
changes made to 385f772bab63581c1bfb12acb1ed47267b4590ea.

Conflicts:
	Rolit/src/rolit/gui/RView.java
Revert "Revert "Merge conflicts""

This reverts commit ff6ee5b7f7e4ee12765831997870aae33bc4e1d7.