solución de conflictos
Merge branch 'dev'
Merge branch 'dev'

Turn management ready for testing
Added support for active/current
Last seen turn bugfix