Revert "fixing the problem of pre-emptive controller loading if you're deploying code with a migration and an admin_assistant controller at the same time"
Revert "fixing the problem of pre-emptive controller loading if you're deploying code with a migration and an admin_assistant controller at the same time"

This reverts commit 6acad11f75f1974983ee0b56d5c65d79c7786f7d.

Conflicts:

	lib/admin_assistant.rb

fhwang/admin_assistant,fhwang/admin_assistant