#1 Wifi enable
#1 fix eclipse
#1 test
#1 first commit olivier
#1 test
#1 end test
#1 last commit
Merge branch 'origin/#1'

Conflicts:
	src/com/test/MainActivity.java