[MOD] Alteração para uniformizar o repositório.
Merge branch 'master' of https://github.com/jmc12976/confX

Conflicts:
	confX/src/com/pi/confx/ContactDetailsFragment.java
	confX/src/com/pi/confx/DownloadFilesService.java
	confX/src/com/pi/confx/MainActivity.java
	confX/src/com/pi/confx/People.java