fix file extension in file renaming
nyoba wifi
test wifi p2p
tes
Merge branch 'finalweek/ricky' into paling-baru

Conflicts:
	AndroidManifest.xml
	project.properties
	res/values/strings.xml