The last commit did'nt work properly. Maybe this wanna be.
Merge remote-tracking branch 'origin/master'

Conflicts:
	nbproject/Makefile-genesis.properties
GetInputLine()