Pantalla de tips y notas esperando por CSS
Merge branch 'master' of https://github.com/NiuMedia/bride2be

Conflicts:
	app/views/drawerExample/tips-flores.html