Updating specs, renaming lib/onix to lib/onix2 to avoid naming conflicts.
Merge branch 'dev'