Line numbers / Preferences dialog
Merge branch 'master' of https://github.com/stevenremot/RaSKlett

Conflicts:
	src/graphicInterface/MainWindow.java
Merge branch 'master' of https://github.com/stevenremot/RaSKlett