Carga de contactos del teléfono a un ListView
Merge branch 'master' of https://github.com/codewaffles/staphylococcus

Conflicts:
	FocusedApp/res/drawable-hdpi/ic_launcher.png
	FocusedApp/res/drawable-mdpi/ic_launcher.png
	FocusedApp/res/drawable-xhdpi/ic_launcher.png
	FocusedApp/res/drawable-xxhdpi/ic_launcher.png
	FocusedApp/res/menu/main.xml
	FocusedApp/res/values-sw600dp/dimens.xml
	FocusedApp/res/values-sw720dp-land/dimens.xml
	NFCContacts/res/drawable-mdpi/ic_launcher.png
	NFCContacts/res/drawable/ic_launcher.png
	NFCContacts/src/com/codewaffles/nfccontacts/MainActivity.java

Inicializado proyecto. Resolviendo conflictos en commit