Added sorting, removing total column, separate markers overall into proposal and final tables
Added sorting, removing total column, separate markers overall into proposal and final tables
Merge origin/master

Conflicts:
	Library/Helpers/Table_Generation.php