updated branch alias
added method for better BC with AsseticBundle
Merge branch '1.1.x'
fixed array to string warning
Merge branch '1.1.x'