add c13
hotfix1.2.2
Merge branch 'master' of github.com:lambertli/myapp into hotfix1.2

Conflicts:
	app.rb