Fix URL
Conflict resolution
Add docs from Github wiki
Merge branch 'master' into dev
Merge branch 'dev' of https://github.com/PhonyTive/astivetoolkit into dev