Added git merge driver and attributes that force git to keep local versions of files in {client,server}/app whenever conflicts arise.