Merge
Merge branch 'master' of https://github.com/jianlongli/SNSCloud

Conflicts:
	app/views/circle/index.volt.php
Add export author