beetje commentaar erbij
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/amaze/quit/app/Progress.java
	app/src/main/java/com/amaze/quit/app/SetupBrandAmount.java
beetje commentaar erbij