Revert "question b2"

This reverts commit 273ef1019964c71dd38f46ea47f8480144168113.
Merge remote-tracking branch 'origin/afk'
Se arreglo todo, se agrego bower, test, etc, etc.
se agrego utils.js
question controller
conflict resolver
Merge branch 'master' into afk
arreglo de questions
se eliminaro archivos de dependencia para usar luego con Bower
cambios en postInstall
Merge branch 'master' of https://github.com/uccor/labit
agregue test de question
merge?