Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
	config/locales/en.yml
	db/schema.rb
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/locales/en.yml
	db/schema.rb
manual merge
manual merge rhakim