remove key1
Merge remote-tracking branch 'origin/master'

Conflicts:
	resources/message.properties
conflict solved