intellij/eclipse tmp ignored
Clean and working repo
Now RetroShare peers are added to android contact list

Conflicts:
	RetroShareRemote/AndroidManifest.xml
Now RetroShare peers are added to android contact list

Conflicts:
	RetroShareRemote/AndroidManifest.xml
Now RetroShare peers are added to android contact list

Conflicts:
	RetroShareRemote/AndroidManifest.xml
first attempt to give an update on the status of contacts
Repository cleaning
Momentaneously commented QrCode stuff because of problem with zxing dependencies
Code cleaning