Version1.5 with products in file
Problems with git
Gradle build problems
Clean up VCS
Merge branch 'v1.6'

Conflicts:
	.gitignore
	.idea/copyright/profiles_settings.xml
	.idea/dictionaries/Hans.xml
	.idea/gradle.xml
	.idea/inspectionProfiles/Project_Default.xml
	.idea/misc.xml
	Boodschappenlijst.iml
	Boodschappenlijst/Boodschappenlijst-Boodschappenlijst.iml
	Boodschappenlijst/build.gradle
	gradle/wrapper/gradle-wrapper.properties
Merged 1.6
vcs
vcs update
vcs