fix conflict with devise

We are using browserid for admin authentification and this conflicts with devise which is used for the website itself. Please let me know if you are going to merge this into tree and push new gem version.
Thanks!