NOJIRA: cleanup form / selectForm
Merge pull request #32 from vbonamy/CLEAN2

NOJIRA: cleanup form / selectForm