change textarea to textpane, test on edit works
resolve conflict IndigoMain

Conflicts:
	IndigoMain.java