Añadidos comentarios a .gitignore
Añadido application.html
Merge branch 'features/v2_0-f001' into v2_0