Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of git://github.com/quizzingbricks/quizzingbricks-core
Merge pull request #24 from ahlen/master

Merge remote-tracking branch 'upstream/master'