auto deploy modified
allow deploy script without pass
local changes
gitignore htaccess
removing test deploy
Merge branch 'master' into staging