refactoring to Activities
Merge branch 'master' of https://github.com/joaotfernandes/PDMRepo

Conflicts:
	ThothMobile/src/pt/isel/grupo3/thothmobile/MainActivity.java