added debug.keystore to travis build environment
travis ci: fixed path of debug.keystore
refactorings
Merge branch 'master' into nav-drawer