Merge branch 'master' into dev_branch

Conflicts:
	src/ValueChartsPlus.java
Merge branch 'master' into dev_branch
first addition of box plot for utility functions
added overlay of user data in value function box plots; some refactoring in how user legends are generated
remove user color mapping option; move average value chart button to menu bar
fix variance calculation
use standard deviation instead of variance in calculating heatmap
fix colours in average chart
add criteria variance analysis and average weights to average chart
refactored weight calculations to own class; add show average score; make average VC thinner; fix variance by score calculation
make abstract criteria header sizes thinner
changed wording of actions; add AVG value to header label when average weights are displayed
add show all users option to value function box plots; add right click to select all when initializing
changed variance heatmap to be absolute rather than relative scale; added legend window for colours and % of disagreement; changed colours to go from green to red
Add showing of extreme users with names and points in box plot for value functions
change font for box plot min/max labels
added alternative version of average chart; added average scores display
make hover text smaller
Added alternative indexing and legend; fix header widths when only one level of criteria exist
make criteria order consistent in main interface upon loading from file