fix typo
Merge pull request #179 from libis/fix_typo

fix typo
Merge branch 'master' into master-fix

* master:
  fix typo

Conflicts:
	app/lib/core/View.php
NOJIRA Less restrictive path regexp for external applications

See https://github.com/collectiveaccess/providence/issues/184
Merge branch 'master-fix' into develop

* master-fix:
  NOJIRA Less restrictive path regexp for external applications
  fix typo

Conflicts:
	app/helpers/mediaPluginHelpers.php