Options fix
Merge branch 'master' of https://github.com/larchanka/x-framework
QUnit tests for Collections and Models added