com
Merge branch 'master' of https://github.com/heijmen/WWYAndroid

Conflicts:
	src/com/wwy/wwyandroid/WWYAndroid.java