Fix image loading.
Merge branch 'develop' of github.com:stevenfanwu/emenu_android_client into develop

Conflicts:
	emenu_android_client.iml