updated branch alias
require assetic 1.1.x
Added the Travis config
Merge branch '2.3'

Conflicts:
	composer.json