save progress
Merge branch 'master' of github.com:liweinan/ett

Conflicts:
	app/views/packages/show.html.erb
bz inline editor part2