swagger fixes
Merge branch 'development' of github.com:fluxtream/fluxtream-app into development