Testing master not dev
Merge branch 'dev'
Merge branch 'dev'
Add composer support.