Leaving in an original state the class
Merge branch 'master' of https://github.com/ivansanchezvera/ScavengerHunt
Changing to the original state the class
Merge branch 'master' of https://github.com/ivansanchezvera/ScavengerHunt
Changes in notification id
leaving the class in original state, changed because the localx.properties doesn't recognized the original file.
Merge branch 'master' of https://github.com/ivansanchezvera/ScavengerHunt

Conflicts:
	src/unimelb/mit/mobile/scavengerhunt/MainActivity.java
Changing app name home screen
Merge branch 'master' of https://github.com/ivansanchezvera/ScavengerHunt
Solving problems with git
Merge branch 'master' of https://github.com/ivansanchezvera/ScavengerHunt
Changing some messages and the call to the next activity after login.
Merge branch 'master' of https://github.com/ivansanchezvera/ScavengerHunt
Merge branch 'master' of https://github.com/ivansanchezvera/ScavengerHunt
Merge branch 'master' of https://github.com/ivansanchezvera/ScavengerHunt