Updated Asset-Pipeline pugin
update to Gradle 2.1
Merge branch '2.4.x'