lin20140416
lin20140417
lin20140417
Merge remote-tracking branch 'remotes/origin/lin'

Conflicts:
	daixie/templates/404.html
	daixie/templates/general/price.html
	daixie/templates/layout.html
Kexi 0419