some changes
Merge branch 'master' of git@scm.readonphone.com:awesomescreenshot-website.git
some fix
fix bug, delete project user
Merge branch 'master' of git@scm.readonphone.com:awesomescreenshot-website.git
some fix
company profile, fix some bug!
Merge branch 'master' of git@scm.readonphone.com:awesomescreenshot-website.git

Conflicts:
	log/screenshot.log