Merge branch 'hotfix/pre-commit'
PSR2
PSR2
test
Merge branch 'hotfix/psr2-boardgame20130712' into develop