fixing the form editor
Merge branch 'master' of github.com:hrisproject/hris
Merge branch 'master' of github.com:hrisproject/hris

Merging trunks
changes on the editor tool
Merge branch 'master' of github.com:hrisproject/hris