Remove composer.lock from gitignore
Merge remote-tracking branch 'origin/1.2' into 1.2
Merge pull request #12 from timoschaefer/1.2

Merge branch '1.2'