Dangerous attempt at something
Merge branch 'master' of https://github.com/Jorl17/inforestudante-mobile

Conflicts:
	Inforestudante/gen/com/example/menu_principal/R.java
	Inforestudante/src/com/example/assiduidade/AssiduidadeActivity.java