commit all
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/cache/dev/profiler/index.csv
	app/logs/dev.log
commit all
git ignore cache logs do not work ?
commit all accept logs and cache