Merge branch 'Dennis'

Conflicts:
Common/bin/Common.apk
Common/bin/classes.dex
Common/bin/classes/com/example/common/R$string.class
Common/bin/classes/com/example/common/R$style.class
Common/bin/resources.ap_