Added --datadir/--userdir command line arguments and SUPERTUX2_DATA_DIR environment variable (probably redundant)
Merge remote-tracking branch 'base/master'