Merge branch 'feature/gallerytype' into release/1.2
Fixing Undefined Variable  The thumb_gallery was using a undefined variable "$atts['id'];" that variable do not exist, using the $gallery_id variable instead.  Signed-off-by: Enrique Chavez <noone@tmeister.net>
Merge branch 'feature/gallerytype' into release/1.2
Merge branch 'bug/imagesize' into release/1.2
Merge branch 'bug/postid' into release/1.2
fix #138
attempt #132
fix #127
changelog
Merge branch 'feature/filter' into release/1.2
changelog
1.2
Merge branch 'master' into dev

Conflicts:
	admin/assets/js/generator.min.js
	admin/assets/js/generator.min.js.map
recompile