AgregarPerfil y datepicker2
AgregarPerfil y datepicker2
Merge origin/master

Conflicts:
	platforms/android/assets/www/AgregarActividad.html
	platforms/android/assets/www/AgregarPerfil.html
	platforms/android/assets/www/css/EstilosApp.css
	platforms/android/assets/www/index.html
	platforms/android/assets/www/perfil.html