Merge branch 'master' into dev
#9 - Second axis ("gatting variables") is now shown
#10 - Added legend and changed default color of "h"
#11 - Removed tick settings
#12 - Some work on color feature
#13 - More work on colors
#14 - Optimized color code using QVectors
#15 - Colors in Settings class completed
#16 - Cleaned up work on color selection
#17 - Prepared for release
Merge branch 'release-1.0.2'