Merge remote-tracking branch 'remotes/origin/master' into Eventsbuses

Conflicts:
	app/src/main/java/cornx/meetly/app/AppModule.java
	app/src/main/java/cornx/meetly/events/EventsFragment.java
	app/src/main/res/layout/row_fragment_teams.xml
Merge remote-tracking branch 'remotes/origin/master' into Eventsbuses

Conflicts:
	app/src/main/java/cornx/meetly/app/AppModule.java
	app/src/main/java/cornx/meetly/events/EventsFragment.java
	app/src/main/res/layout/row_fragment_teams.xml
Merge remote-tracking branch 'remotes/origin/master' into Eventsbuses

Conflicts:
	app/src/main/java/cornx/meetly/app/AppModule.java
	app/src/main/java/cornx/meetly/events/EventsFragment.java
	app/src/main/res/layout/row_fragment_teams.xml
Merge remote-tracking branch 'remotes/origin/master' into Eventsbuses

Conflicts:
	app/src/main/java/cornx/meetly/app/AppModule.java
	app/src/main/java/cornx/meetly/events/EventsFragment.java
	app/src/main/res/layout/row_fragment_teams.xml