punt i a part
Merge branch 'develop' of https://github.com/elcamilet/miprimerapp into develop