from Alpha, tested on Moto G
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_annotations_21_0_3.xml
	.idea/libraries/support_v4_21_0_3.xml
	.idea/misc.xml
	build/intermediates/dex-cache/cache.xml
	local.properties
from Alpha, tested on Moto G
from Alpha, with Async