rails 3.2.13, random blending method
Merge branch 'master' of github.com:sh0w/serendipity

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
Merge branch 'master' of github.com:sh0w/serendipity