Tidied up file structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	Android File Transfer/Android File Transfer.iml