- list row adapters
- list item view models
- main page layout
Merge branch 'master' of https://github.com/ahetawal/cheese

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/R.txt
	bin/classes/Models/Cheese.class
	bin/classes/Models/User.class
	bin/classes/Repositories/CheeseDAO.class
	bin/classes/Repositories/CheeseDAOImpl$1.class
	bin/classes/Repositories/CheeseDAOImpl.class
	bin/classes/Repositories/UserDAO.class
	bin/classes/Repositories/UserDAOImpl.class
	bin/classes/Utilities/CheeseTransformer.class
	bin/classes/Utilities/TransformerManager.class
	bin/classes/Utilities/UserTransformer.class
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/example/stealthecheese/MainActivity.class
	bin/classes/com/example/stealthecheese/R$drawable.class
	bin/classes/com/example/stealthecheese/R$id.class
	bin/classes/com/example/stealthecheese/R$integer.class
	bin/classes/com/example/stealthecheese/R$layout.class
	bin/classes/com/example/stealthecheese/R$menu.class
	bin/classes/com/example/stealthecheese/R$string.class
	bin/classes/com/example/stealthecheese/R$style.class
	bin/classes/com/example/stealthecheese/R$styleable.class
	bin/classes/com/example/stealthecheese/UnitOfWork.class
	gen/android/support/v7/appcompat/R.java
	gen/com/example/stealthecheese/R.java
	res/layout/activity_main.xml
	src/Models/User.java
	src/Repositories/UserDAO.java
	src/com/stealthecheese/activity/MainActivity.java
	src/com/stealthecheese/model/Cheese.java
	src/com/stealthecheese/model/Transaction.java
	src/com/stealthecheese/model/UnitOfWork.java
	src/com/stealthecheese/provider/CheeseDAO.java
	src/com/stealthecheese/provider/CheeseDAOImpl.java
	src/com/stealthecheese/provider/TransactionDAO.java
	src/com/stealthecheese/provider/TransactionDAOImpl.java
	src/com/stealthecheese/provider/UserDAOImpl.java
	src/com/stealthecheese/util/CheeseTransformer.java
	src/com/stealthecheese/util/CloudFunctionService.java
	src/com/stealthecheese/util/CloudFunctionServiceImpl.java
	src/com/stealthecheese/util/TransactionTransformer.java
	src/com/stealthecheese/util/TransformerManager.java
	src/com/stealthecheese/util/UserTransformer.java
Merge branch 'master' of https://github.com/ahetawal/cheese

Conflicts:
	AndroidManifest.xml
	project.properties
	res/values/strings.xml
	src/com/stealthecheese/activity/MainActivity.java
	src/com/stealthecheese/application/StealTheCheeseApplication.java
no message