Removed letters to resolve conflict with surveyor and updated surveyor to 1.1.0
Fixing models spec
spec/controllers/signatures_controller_spec.rb + spec/models/signature_spec.rb fix
uncommented spec/controllers/ideas_controller_spec.rb
spec/controllers/pages_controller_spec.rb fix
additional tests for ideas_controller_spec.rb + using newest gemfile (by darkcoin)
something
Fix typos in vote pie chart legend
Merge pull request #314 from pvalkone/patch-1

Fix typos in vote pie chart legend
Rails update 3.2.12
Merge pull request #335 from naleksi/master

Rails update 3.2.12
Merged wasimakram/surveys
Updated New Relic RPM to have proper Heroku queuing stats
Removed letters to resolve conflict with surveyor and updated surveyor to 1.1.0
Merge branch 'master' of github.com:naleksi/avoinministerio
Merged ArturG/testing
Merge branch 'master' of github.com:avoinministerio/avoinministerio

Conflicts:
	Gemfile
	Gemfile.lock
	spec/controllers/ideas_controller_spec.rb
	spec/controllers/pages_controller_spec.rb
	spec/models/idea_spec.rb
	spec/spec_helper.rb