Merge branch 'master' into feature/posts
Refactor posts controller
Merge branch 'feature/posts'