Version 3.0.1
Version 3.1.2
Merge branch 'master' of https://github.com/lawi75/Vinguiden-Pro.git

Conflicts:
	AndroidManifest.xml
	src/ws/wiklund/vinguiden_pro/db/WineDatabaseHelper.java
	src/ws/wiklund/vinguiden_pro/db/WineDatabaseUpgrader.java
	src/ws/wiklund/vinguiden_pro/list/CellarCursorAdapter.java
	src/ws/wiklund/vinguiden_pro/util/BeverageAndCellarContainer.java