moved setup and teardown methods back in the testcases
Merge branch 'master' of github.com:matthias-springer/deli

Conflicts:
	test/functional/controller_test_base.rb
	test/functional/lectures_controller_test.rb