added support for mars and other strategies
added mars strategy
Merge branch 'simple' into union
Merge branch 'qsub' into union