wifi direct changes
Merge branch 'master' of https://github.com/tjuicy/Cardify

Conflicts:
	.gitignore
	project.properties