* commit 'ctran/v2_0_2':
  upgrade to newgem 1.3

Conflicts:
	lib/tasks/annotate.rake
	lib/tasks/annotate_models.rake
	test/test_helper.rb