use Integer instead of int for effort values so that we can check for null rather than using the hasEffort booleans
Merge branch 'dev-gradle' of https://github.com/slash-slash-no-comment-WPI-cs3733/wpi-suite into remove-hasEffort
Merge branch 'remove-hasEffort' into dev-gradle