rename a simple ivar
change show template
update server tests
Merge branch 'master' into skeleton

Conflicts:
	lib/rails_lite/controller_base.rb