merging in master
Issue #26 Add label in the form for image trimmer

Add the label "4. Picture" to indicate the image trimmer in the form.
Issue #26 Align image trimmer

Place image trimmer in bootstrap grid system.
Ignore .swo files
Merge branch 'master' into time-picker