Added new tokens 'sf()' and 'wf()' for setting fairness constraints. 'SF()' and 'WF()' should be removed later.
Merge remote-tracking branch 'origin/develop' into develop