Updated about page
Update blog
Updated site
Blog updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/2010/11/24/activemodel-in-rails3-table-less-model-can-behave-like-active-record-model/index.html
	public/atom.xml
	public/blog/categories/activemerchant/atom.xml
	public/blog/categories/jquery/atom.xml
	public/blog/categories/paymentgatewayplugin/atom.xml
	public/blog/page/2/index.html
	public/sitemap.xml