synchronizing
Merge remote-tracking branch 'origin/master'

Conflicts:
	.metadata/.mylyn/.tasks.xml.zip
	.metadata/.mylyn/tasks.xml.zip