Merge branch 'develop' of github.com:kaize/castle into feature/edit_photo_at_news-59
fixes
Merge branch 'feature/edit_photo_at_news-59' into staging