multi pantallas
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/insertarnota_act.xml
	res/layout/modificarnota_act.xml
	src/com/tfd/classmarks/FragmentAsig.java
mierder
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout-large/insertarnota_act.xml
	res/layout/asignatura_frag.xml
	res/layout/confimar_eliminar_act.xml
	res/layout/insertarnota_act.xml
	res/layout/modificarnota_act.xml
	res/layout/nuevaasignatura_act.xml
	src/com/tfd/classmarks/Principal.java