Fixed the administration feature store setting bug.
Merge branch 'master' of github.com:Jellyfishboy/trado

Conflicts:
	config/database.yml