Merge pull request #185 from nikicat/master

added graphite functions: percentileOfSeries, sumSeriesWithWildcards, averageSeriesWithWildcards
Added nPercentile and keepLastValue
Fixes #191, update graph after adding new function and not changing default value
Added hitcount Transform function.
Improved markdown formatting in the contributing page.
Merge pull request #194 from danharvey/add-hitcount-function

Added hitcount Transform function.
Workaround a behavior modification probably in grunt-string-replace
Merge pull request #208 from fstern/master

Added graphite functions: nPercentile and keepLastValue
fixed string replace issue that caused problems, this removes build cache busting in requirejs, will need to fix that later
Merge branch 'master' of github.com:torkelo/grafana
fixed karama tests
added phantomjs karma test to run in travis
Add logarithmic scale function
Merge pull request #212 from andrewmichaelsmith/log_func

Add logarithmic scale function
Adds support to have filters inside filters, (nested templated segments), Closes #128
Fix a "kibana" leftover in comments
Merge pull request #213 from jaimegago/master

Fix a "kibana" leftover in comments
make html-unsafe for text/html panels
make html-unsafe for text/html panels
Merge branch 'master' of github.com:bruce-lyft/grafana