Merge remote-tracking branch 'origin/master' into aws_gradle

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	WaterFountain.iml
Merge remote-tracking branch 'origin/aws_gradle' into aws_gradle
Merge remote-tracking branch 'origin/master' into aws_gradle

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	WaterFountain.iml