readme test
lixxtest
Merge https://github.com/guadan2001/android.jywave.com

Conflicts:
	README.txt