synchronize with server
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/winify/happy_hours/activities/LogInActivity.java
	src/com/winify/happy_hours/activities/MainActivity.java
	src/com/winify/happy_hours/activities/SettingsActivity.java
	src/com/winify/happy_hours/activities/ShowUserInfoActivity.java
	src/com/winify/happy_hours/controller/ServiceGateway.java
synchronize with server 2nd try