Final wifi
Merge branch 'master' of https://github.com/kgeorgieva/ggjCJK

Conflicts:
	src/com/cjk/thecloud/MainActivity.java
Merge branch 'master' of https://github.com/kgeorgieva/ggjCJK

Conflicts:
	src/com/cjk/thecloud/MainActivity.java
Wifi
Merge branch 'master' of https://github.com/kgeorgieva/ggjCJK