Travis conf
chmod app/console
Fix travis parameters
Merge branch 'master' into unit-tests

Conflicts:
	.travis.yml