* Update Rails 3.2.17
* Minor Changes
Merge branch 'master' of https://github.com/marcelosoaressouza/mapadacultura

Conflicts:
	Gemfile