.gitignore updated
Merge
Merge branch 'master' into admin-approvals

Conflicts:
	.gitignore
	config/locales/en.yml
	config/locales/es.yml
	db/seeds.rb
Generating milestones randomly
Merge branch 'master' into admin-approvals
Added buttons for campaign and organization, showing milestones
Buttons of approval for organizations, campaigns and milestones that trigger an alert for now, also internationalization of milestones
edit user and password
Merge branch 'milestones' into admin-approvals

Conflicts:
	db/schema.rb
Merge branch 'master' into admin-approvals

Conflicts:
	config/locales/en.active_record.yml
	config/locales/en.yml
	config/locales/es.active_record.yml
	config/locales/es.yml
Falto uno
Merge pull request #28 from ITBA/admin-approvals

Admin approvals
fixes for ita
user set properly on form. labels fixed for password change
Hot fixes
Merge branch 'profile-edit', remote-tracking branch 'origin'

Conflicts:
	app/views/users/show.html.slim
	config/locales/en.active_record.yml
	config/locales/en.yml
	config/locales/es.active_record.yml
	config/locales/es.yml
	config/routes.rb
Fixed some bugs and style
Migration rollback
Fixed some mercado pago code style
Fix style