Merge branch 'bug_fixes' into develop
Merge branch 'bug_fixes' into develop
Merge branch 'bug_fixes' into develop
Merge branch 'bug_fixes' into develop
Added stop event propagation on button.
Merge branch 'stop_event_propagation' into develop
Changed variable name.
Changed thumbnail image to show the right image.