This seems to work fine
Merge remote-tracking branch 'origin/master'

Conflicts:
	Middleman/Middleman/src/main/java/com/team/hv/middleman/middleman/MiddleManMainActivity.java