Update confs and add mobilelock project
Merge branch 'master' into gh-pages