Install git/php5-cli
Merge branch 'dev'