First commit
Merge branch 'master' of github.com:prasser/arx-3.0