Merge branch 'dev' of github.com:dimitriv/Ziria into release
Ported WiFi/testbed to the new parser
Merge branch 'release' of github.com:dimitriv/Ziria into release