Merge branch 'develop'
Added armv7s to static lib target
Merge branch 'master' into develop