Updated codebase to Biscuit 2.1 version
Updated framework submodule to Biscuit 2.1