Issue with regex and underscore #90
Merge branch 'dev' of github.com:bearded-avenger/aesop-core into dev

Conflicts:
	admin/assets/js/tinymce/aiview/plugin.js
	admin/assets/js/tinymce/aiview/plugin.min.js
underscores