Adapters almost working.
Merge branch 'develop' of github.com:siroky/Swat into develop