Assets Pipeline - Carregar CSS/JavaScript de acordo com o controller
merge conflict fix