Time Fix.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/es/celor/computacionmovilapp/app/MainMenuActivity.java
Clean.