Changed formatting, added some calendar stuff
Merge branch 'master' of https://github.com/Rokford/PowerfulShoppingList-AS

Conflicts:
	app/src/main/java/com/example/powerfulshoppinglist/AddRecipeItemActivity.java
	app/src/main/java/com/example/powerfulshoppinglist/DatabaseCreator.java
	app/src/main/java/com/example/powerfulshoppinglist/DatabaseManager.java
	app/src/main/java/com/example/powerfulshoppinglist/ShoppingItem.java