INDI on current master

Conflicts:
	conf/messages.xml
testing with quadshot