add stored templates and editor
add stored templates and editor
add criteria commands
add criteria commands
Merge master into development
correct orgName search, Person entity
correct orgName search, Person entity
correct orgName search, Person entity
Merge development

Conflicts:
	.gitignore
	src/Vol/VolBundle/DataFixtures/ORM/LoadTemplateData.php
track all searches
change bundle names
manage criteria
Renamed bundles
add search objective
refactor toolbox; create search record service
criteria usage view
edit focus enabled, add focus
edit skill enabled, add skill
css housekeeping; template drop-down menu
admin user & criteria as drop-down menus