merge posts-front-end branch