bug fix y generacion de modelo subcategorias
Merge branch 'master' of https://github.com/TBFMX/eym

Conflicts:
	config/initializers/omniauth.rb

merge