Arreglo de tokenize =D
Mejora en tokenizado =D
Dotaciones con número cambiable (Js incluido)
Merge branch 'mixing' of https://github.com/LucasPadovan/firehouse into mixing

Conflicts:
	app/views/interventions/_form.html.erb
	app/views/interventions/show.html.erb