Removing duplicated locale rules
Cleaning conflicts
Merge branch 'develop' of github.com:guluc3m/gul-gultalks into develop
Removed deprecated code
Merge branch 'develop' of github.com:guluc3m/gul-gultalks into develop

Conflicts:
	app/assets/stylesheets/talks.css.scss
Add missing Gemfile update
Updated some config files
Merge remote-tracking branch 'upstream/develop' into develop