update to current snapshot
Merge branch 'wip-scala-chart-current-snapshot' of git://github.com/wookietreiber/scalameter into wookietreiber-wip-scala-chart-current-snapshot
Merge branch 'master' of github.com:scalameter/scalameter

Conflicts:
	src/main/scala/org/scalameter/reporting/ChartReporter.scala
Merge pull request #72 from axel22/master

Merging wookietreiber's changes, resolving some conflicts