Added ARMv7 and x86 architectures for Android
Merge branch 'dev'
CSS fix for Android