WIP
Merge branch 'kpi/0.1' of github.com:rainmore/play2 into kpi/0.1