link layouts with testActivity
Merge branch 'master' into AndiPatch
Merge branch 'AndiPatch'