actualizacion de modulo de directivas
Merge branch 'master' of https://github.com/proyect-IPUC/new-ipuc

Conflicts:
	app/views/cancions/index.html.erb
	config/routes.rb
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/development/sprockets/8c2b061e379a23e7c4d207adcf992462
	tmp/cache/assets/development/sprockets/b3da405f1e68470ad6146a1322f2438c
	tmp/cache/assets/development/sprockets/bcca522c6302f184f12fe0e8a7d7e71a
	tmp/cache/assets/development/sprockets/c13fc73ceafa45876a901b3e775b83ae
	tmp/cache/assets/development/sprockets/cf1e3cebfad43293c3c470a5e437ebc9
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d585a06e2ee6203ccb04c8b84150d14d
	tmp/cache/assets/development/sprockets/e1aa402390382db4d97b27cb094485fa
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655