save .log file
save .log file
modify changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Wanna/.classpath
	Wanna/bin/AndroidManifest.xml
 updated changes to android manifest in order to merge