changes after Cisco
Merge branch 'master' of https://github.com/thenewcircle/android-bootcamp-labs