Test commit
Working functionalities enabled!
Merge branch 'refs/heads/CryptoTest'

Conflicts:
	AndroidSecureMesh/src/pt/up/fe/ssin/androidsecuremesh/ui/ChatUsersList.java
	AndroidSecureMesh/src/pt/up/fe/ssin/androidsecuremesh/utils/NewChatUserAsyncTask.java
	AndroidSecureMesh/src/pt/up/fe/ssin/androidsecuremesh/utils/PacketFactory.java