Dhaval - Rails 3 upgrade
Atreyee - removing old rails2 files after making necessary changes to corresponding new files
Atreyee - upgraded prawn gem and added prawnto gem to make pdf functionality work with rails 3
Atreyee - fixed multiple stickies getting created after rails 3 upgrade. votes is still broken.
Merge branch 'master' into rails3

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/controllers/points_controller.rb
	app/controllers/retros_controller.rb
	app/views/retros/new.html.erb
	app/views/retros/show.html.erb
	config.ru
	config/routes.rb
upgrade with mobileweb and web working with ruby 1.8
changing ruby 1.9.3-p392
some state, lets fix it and get it done
removing rails_upgrade plugin; moving acts_as_soft_deletable to lib folder to make it compatible with current rails version
Merge branch 'master' into rails3

Conflicts:
	.gitignore
	app/assets/javascripts/mobile/app/views/ideas_view.js
	public/stylesheets/newhome.css
fix image path
fix redirect url
correcting typo in name
fixing encoding stuff on normal web ideaboardz
mobile looking better now
Merge branch 'master' into rails3

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/retros/new.html.haml
	config/database.yml.sample
moving to ruby 2 and rails 3.2.15
fixing create form
fixing ios app image on home page