Merge upstream changes - #2

Merged

Sthing merged 12 commits into

Netimage:masterfrom

QuickPay:master

Mar 15, 2016

Commits on Jul 6, 2015

Commits on Mar 13, 2016

Commits on Mar 14, 2016

Merge pull request #18 from lsolesen/travis
ta
committed
fba5031
Added build status gfx
ta
committed
e1939f0
Merge pull request #20 from lsolesen/composer
ta
committed
6013d76
Merge pull request #19 from lsolesen/phpcs
ta
committed
1967423