typo
Merge pull request #58 from DannyJoris/7.x

fixed typo
Final Commit
Merge branch '7.x' of github.com:Islandora/islandora_content_model_forms into 7.x

Conflicts:
	includes/edit.form.inc
Merge pull request #60 from jonathangreen/7.x

Final Commit
fixup