Merge branch 'master' into multiple_value_sort

Conflicts:
	ng-table.js
	ng-table.map
	ng-table.src.js
	src/scripts/04-controller.js
Whenever sorting params change, update the currently sorted column
Merge branch 'multiple_value_sort' into goodeggs

Conflicts:
	ng-table.js
	ng-table.map
	ng-table.src.js
	src/scripts/04-controller.js