Merge branch 'master' into gh-pages

Merge

Author: barrantesgerman

_posts/2015-04-07-metrics.md

@@ -32,11 +32,11 @@ Now you are ready to start annotating your route handler methods or controller m
 You have several choices in the collection of metrics:
 
 - *Do nothing*
-- [Counted]({{ site.codeurl }}/pippo-metrics/src/main/java/ro/pippo/metrics/Counted.java)
+- [Counted]({{ site.codeurl }}/pippo-metrics-parent/pippo-metrics/src/main/java/ro/pippo/metrics/Counted.java)
 A counter increments (and optionally decrements) when a method is executed.
-- [Metered]({{ site.codeurl }}/pippo-metrics/src/main/java/ro/pippo/metrics/Metered.java)
+- [Metered]({{ site.codeurl }}/pippo-metrics-parent/pippo-metrics/src/main/java/ro/pippo/metrics/Metered.java)
 A meter measures the rate of events over time (e.g., “requests per second”). In addition to the mean rate, meters also track 1-, 5-, and 15-minute moving averages.
-- [Timed]({{ site.codeurl }}/pippo-metrics/src/main/java/ro/pippo/metrics/Timed.java)
+- [Timed]({{ site.codeurl }}/pippo-metrics-parent/pippo-metrics/src/main/java/ro/pippo/metrics/Timed.java)
 A timer measures both the rate that a particular piece of code is called and the distribution of its duration.
 
 1. Start by sprinkling `@Counted`, `@Metered`, or `@Timed` on some of your controller methods.