Code formatting
Merge branch 'develop' of github.com:x-team/wp-stream into develop