mid point inlining

Conflicts:
	lib/adapters/mongoose.js
	lib/controllers.js
	lib/forms/AdminForm.js