marge1
marge2
Merge branch 'aki/mar1' into test01
Merge branch 'aki/mar2' into test01

Conflicts:
	CircleTest/proguard-project.txt