A better organization to read options

* When the first argument is a file, other options were not taken into account. Bug fixed
* Improving organization in cli classes
Some conflicts were fixed

I was working in an older version, bu :(

Merge branch 'master' of github.com:gextech/marathon-runner

Conflicts:
	cli/src/main/groovy/gex/marathon/cli/Config/OptionsCli.groovy
	cli/src/main/groovy/gex/marathon/cli/MarathonCli.groovy
	cli/src/main/groovy/gex/marathon/cli/MarathonConsoleCallBack.groovy
File argument position was fixed

According to standard, arguments go after options... I was wrong, and put it at begining.
Fixed! :D
Merge pull request #12 from anallely/master

A better organization to read options