Fixed multidex bugs
Prepared for dev
Merge branch 'dev' into dev.security
Can properly set the pin lock