First initial commit
Merge branch 'master' of
ssh://git@github.com/SanchezSobrino/Android-NFC-WiFi-Controller-_Server_.git

Conflicts:
	README.md

Change-Id: I42c89853a5eca1ea3abc0ab6954f1746239123c6