Merge pull request #1 from aligent/develop

Merging changes from develop branch
Store the secret and QR code url in the admin session to avoid a new code being generated if a user types their auth code incorrectly
Merge pull request #2 from aligent/bug/qr-code-changes

Fix for issue of QR code changing on each page load #12
Merge pull request #14 from aligent/master

fix bug if QR code entered incorrectly on first attempt of associating account