added maven command line options
Merge branch 'master' into macbookair

* master:
  added maven command line options

Conflicts:
	pages/frank/maven/command_line.txt