Merge remote-tracking branch 'wagn/master' into rspec

Conflicts:
	Gemfile
	Gemfile.lock
merge from source preview optimization branch
fix the create_page for old spec
remove ori files
merge from duplicate_source branch
rspec for some rb
Merge remote-tracking branch 'wagn/master' into rspec

Conflicts:
	Gemfile
	Gemfile.lock
	mod/wikirate/set/self/wikirate_source_preview_page.rb
	mod/wikirate/spec/mod/wikirate/set/all/wikirate_spec.rb
	mod/wikirate/spec/mod/wikirate/set/right/wikirate_article_spec.rb
	mod/wikirate/spec/mod/wikirate/set/right/wikirate_title_spec.rb
	mod/wikirate/spec/mod/wikirate/set/self/webpage_spec.rb
	mod/wikirate/spec/mod/wikirate/set/type/claim_spec.rb
	mod/wikirate/spec/mod/wikirate/set/type/webpage_spec.rb
	spec/spec_helper.rb
remove old files
update submodule file
Merge branch 'source_preview_optimization' into rspec
merged spec_helper.rb
more tests
more tests
Merge branch 'master' into rspec

Conflicts:
	mod/wikirate/spec/mod/wikirate/set/type/webpage_spec.rb
filter search and company comparison
fix some rspecs
fixed contribution count bug
Merge remote-tracking branch 'decko/master'
trim some tests
update gem file