u
c
c
c
c
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_main.xml
c
u
c
c
c
u
u
u
u
u
c
v1.2
u
u