Worked at transfering files from android to pc
Merge remote-tracking branch 'origin/development/architecture' into
development/architecture

Conflicts:
	AmIciTy-incubator-Android/src/net/amicity/common/intelligence/AndroidFileTransfer.java
	Incubator-main/src/net/amicity/pc/communications/FileContext.java