removed plugin advanced custom fields
added advanced custom fields in theme and included
removed get_comment_popup
Merge origin/master