Tables & other stuff

Added datatables.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	stylesheets/bootstrap/bootstrap.css
	stylesheets/template.css
	stylesheets/template.scss