*
Merge origin/master
Cleaned up activity_create_post.xml