Fixed transactions.
Merge remote-tracking branch 'origin/master_dev' into master_dev

Conflicts:
	PolyMeal/src/main/java/com/mustangexchange/polymeal/PolyMealActivity.java