Merge remote-tracking branch 'upstream/Master'

Conflicts:
	library/WiflyControl.cpp
	library/WiflyControl_ut.cpp
Merge remote-tracking branch 'upstream/Master'
- fixed verStr location
TODO: a better fix would to don't use verStr at all!
Merge pull request #154 from tawarisch/master

verStr broke simu build
Merge branch 'ios7Dev' into Master