fix shortcode problem and setting saving

git-svn-id: https://plugins.svn.wordpress.org/enjoy-instagram-instagram-responsive-images-gallery-and-carousel/trunk@937819 b8457f37-d9ea-0310-8a92-e5e31aec5664