import package support bz creation (part 2)
Merge branch 'master' of github.com:liweinan/ett

Conflicts:
	app/controllers/application_controller.rb