Merge branch 'master' of github.com:lishangqiang/robots

Conflicts:
	myblog/__init__.pyc
	myblog/models.pyc
	robotsapp/loaders.py
Merge branch 'master' of github.com:lishangqiang/robots