commit pentru sincronizare
Merge remote-tracking branch 'origin/development/InfrastructureManagers'
into development/InfrastructureManagers

Conflicts:
	AmIciTy-incubator-Android/src/net/amicity/incubator_android/MainActivity.java
	AmIciTy-incubator-Android/src/net/amicity/incubator_android/SimplePeerMachinesManager.java