test branch
Merge branch 'newbranch'

Conflicts:
	app/src/androidTest/java/com/timar/lucian/beermonitor/ApplicationTest.java