g
Merge remote-tracking branch 'origin/master' g

Conflicts:
	Project/workspace/MapYou/src/it/mapyou/view/Login.java
	Project/workspace/MapYou/src/it/mapyou/view/NotificationActivity.java