rm .project
Merge remote-tracking branch 'origin/master'

Conflicts:
	lry_webapp/.project