Global refactoring
Merge branch 'master' into HEAD

Conflicts:
	wineCellar/gen/com/jtit/winecellar/R.java
	wineCellar/res/values/styles.xml
	wineCellar/src/com/jtit/winecellar/view/bottledetail/BottleDetailActivity.java
	wineCellar/src/com/jtit/winecellar/view/cellar/CellarListActivity.java
Edition fixes