Fixed 2.0 branch link
Added composer file
Merge branch 'master' into 2.0