fix html issue, refactor globals, cleanup code
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/js/controllers/dataTableController.js
fix html issue, refactor globals, cleanup code