Merge branch 'master' of https://github.com/jadrake75/ng-scrolling-table

Conflicts:
	examples/index.html
	src/directives/scrolling-table.js
Merge branch 'master' of https://github.com/jadrake75/ng-scrolling-table
Merge remote-tracking branch 'origin/jdrake-working'
Merge remote-tracking branch 'origin/jdrake-working'
Merge branch 'master' of https://github.com/jadrake75/ng-scrolling-table into jdrake-working