materias and grid notas added
Merge branch 'master' of https://github.com/ReyesMagos/Studiapp

Conflicts:
	.idea/gradle.xml
	.idea/misc.xml
	.idea/modules.xml
	AndroidManifest.xml
	app/app.iml
	app/build.gradle
	app/src/main/java/co/reyesmagos/aplicacioncolegios/activities/LoginActivity.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/activities/NavigationActivityMain.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/activities/NotasFragmentActivity.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/dominio/entities/Tareas.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/fragments/NavigationDrawerFragment.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/fragments/NotificacionesFragmentActivity.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/fragments/TareasFragmentActivity.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/fragments/adaptadores/CustomAdapterNotificaciones.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/fragments/adaptadores/CustomAdapterTareas.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/fragments/adaptadores/util/TareaDetail.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/fragments/adaptadores/util/TareaHeader.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/fragments/util/NavigationDrawItem.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/fragments/util/NavigationDrawListAdapter.java
	app/src/main/java/co/reyesmagos/aplicacioncolegios/mocks/TareasFactory.java
	app/src/main/res/layout/activity_navigation_main.xml
	app/src/main/res/layout/fragment_navigation_activity_main.xml
	app/src/main/res/layout/fragment_navigation_drawer.xml
	app/src/main/res/menu/navigation_activity_main.xml
	build.gradle
	gradle/wrapper/gradle-wrapper.properties
fixing project