Refactoring, simplifying, commenting.
Merge branch 'development' of github.com:wprl/baucis into development

Conflicts:
	Controller/middleware/query/create.js