added shortcode choices to the function file
updated gridpress
updated mask to work with gridpress's updates