Implementando carousel en formulario de registro
Adicion de id personaje escogido a las clases
Ultimo arreglo swipes
Seleccion de personajes
Merge branch 'mobile-carousel-nico' of https://github.com/fixmycode/ReinoAritmetico into mobile-carousel-nico

Conflicts:
	mobile/ReinoAritmetico/app/src/main/java/cl/blackbird/reino/activity/RegisterActivity.java
	mobile/ReinoAritmetico/app/src/main/java/cl/blackbird/reino/fragment/RegisterFragment.java
	mobile/ReinoAritmetico/app/src/main/res/layout/mf.xml
Revert "Merge branch 'mobile-carousel-nico' of https://github.com/fixmycode/ReinoAritmetico into mobile-carousel-nico"

This reverts commit 5ed0c3465e88a9adac6c8d521d86181f26009424, reversing
changes made to f926d6e72edb4b6937623ef79cfbc4f71d2fd861.
integrar seleccion de personaje con modificaciones
Cambios en Personajes
Early game activity
Merge branch 'mobile-carousel-nico' into mobile-integration

* mobile-carousel-nico:
  Cambios en Personajes
  integrar seleccion de personaje con modificaciones
  Revert "Merge branch 'mobile-carousel-nico' of https://github.com/fixmycode/ReinoAritmetico into mobile-carousel-nico"
  Seleccion de personajes
  Ultimo arreglo swipes
  Adicion de id personaje escogido a las clases
  Implementando carousel en formulario de registro

Conflicts:
	mobile/ReinoAritmetico/app/src/main/java/cl/blackbird/reino/activity/LobbyActivity.java
	mobile/ReinoAritmetico/app/src/main/java/cl/blackbird/reino/fragment/LobbyFragment.java
	mobile/ReinoAritmetico/app/src/main/res/layout/lobby_layout.xml
	mobile/ReinoAritmetico/app/src/main/res/values/strings.xml
Integración del código de Nico/Carlos y limpieza general
Correcciones al protocolo y a las vistas
Aestetic changes and fixes
Merge branch 'mobile-integration'

* mobile-integration:
  Aestetic changes and fixes
  Correcciones al protocolo y a las vistas
  Integración del código de Nico/Carlos y limpieza general
  Early game activity
  Cambios en Personajes
  integrar seleccion de personaje con modificaciones
  Revert "Merge branch 'mobile-carousel-nico' of https://github.com/fixmycode/ReinoAritmetico into mobile-carousel-nico"
  Seleccion de personajes
  Ultimo arreglo swipes
  Adicion de id personaje escogido a las clases
  Implementando carousel en formulario de registro
Merge branch 'desktop-socket.io'
Se actualiza el modelo de Problem para coincidir con la nueva API
Merge branch 'master' of github.com:fixmycode/ReinoAritmetico

# By mammut (17) and Daniel Francisco Tapia Rybertt (3)
# Via mammut
* 'master' of github.com:fixmycode/ReinoAritmetico:
  Changed the color of the join code block
  Small fix as to how many decimal points to show on numbers at the playing area
  New character pictures
  Now the UID of a game always has length 3. The problems api returns RAND() order
  Lots of visual tweaks like progress bar <3, average time, etc. Youll love em
  added questions seed
  Fixed the fallen player logic. And also the game sends one question and doesnt send more until all players have ended
  Updated the API for character_type. Now the uid cant be changed...
  Fixed the API changes on the problems editing action
  Changed some model attribute names to match the API. changed the UID logic. Fixed the getIdentify, now it returns the character_type
  Changed some model attribute names to match the API. changed the UID logic. Fixed the getIdentify, now it returns the character_type
  Fixed IP address sent to the server
  fixed identify and register
  crud completo preguntas
  Cleaning up
  Implemented bower dependnecies. Now it works beautifly
  Finished the player fallen of the game logic... still need to do some tests when more than one players drops out
  Changed the whole project to Angular.js Works great...
  Now the game sends quiestions and stores answers locally
  The game waits for any fallen student
Fixed pre delivery 2
Merge branch 'master' of github.com:fixmycode/ReinoAritmetico
Changed Quest to mission