Switched from using smartconfig to connect for simplicity
Merge branch 'master' of https://github.com/camsoupa/cc3000

Conflicts:
	cc3000_web_client/basic_wifi_application.c