Feature/blog Merge into Dev