agregado compatibilidad con django 1.6.1
Merge branch 'Jmovil' of https://github.com/jesusnoseq/TakaraHunter into Jmovil
Merge branch 'Jmovil' of https://github.com/jesusnoseq/TakaraHunter into Jmovil

Conflicts:
	TakaraHunter/urls.py