Closes #225.
Merge branch 'develop' of https://github.com/wpninjas/ninja-forms into develop