move password to local (not in git)
Merge branch 'master' of https://github.com/kmng/test_zf