app 13.15
Merge remote-tracking branch 'origin/master'

Conflicts:
	_notes/dwsync.xml
	contact_form/_notes/dwsync.xml
	contador.html
	images/_notes/dwsync.xml
	index.html
	js/_notes/dwsync.xml
	js/adapters/_notes/dwsync.xml
	js/modules/_notes/dwsync.xml
	js/themes/_notes/dwsync.xml
	resources/_notes/dwsync.xml
	resources/icons/_notes/dwsync.xml
	resources/icons2/_notes/dwsync.xml
	resources/icons2/demo-files/_notes/dwsync.xml
	resources/icons2/fonts/_notes/dwsync.xml
	styles/_notes/dwsync.xml
	styles/images/_notes/dwsync.xml
	sucesos.html
	vendor/_notes/dwsync.xml
	vendor/bootstrap/css/_notes/dwsync.xml
	vendor/bootstrap/img/_notes/dwsync.xml
	vendor/bootstrap/js/_notes/dwsync.xml