Merge branch 'master' of https://github.com/PerfectCarl/play-mini-profiler

Conflicts:
	README.textile
Docs