Merge pull request #944 from tyabe/fix_typo

fix typo for new admin style
couchrestmodel password encryption now through 'after_validation'-callback. Now password can be changed without have to change other field.
Merge pull request #945 from lenzcom/master

couchrestmodel password encryption through 'after_validation'-callback
Support keys as symbols when expiring cache

Correct me if I'm wrong but a cached value can be set using either a String and a Symbol. In other words:

  cache(:something, 'some value')

is the same as:

  cache ('something', 'some value')

I don't know if there's a particular reason not to use Symbols but if you're trying to expire a cached value created using a Symbol key you get an error unless there's an URL on the controller that matches that key, in which case it's even worse since that's not what you're trying to achieve when deleting that key.

I'm attaching a simple patch to support both Symbols and Strings.

Let me know if it should be like that or I'm just missing something.

Thanks
Merge pull request #947 from dariocravero/patch-2

Support keys as symbols when expiring cache
fix 404 handling
Merge pull request #949 from dayflower/fix404

fix 404 handling
Changed Padrino-Flash to check env['rack.session'] instead of settings

This enables Padrino-Flash to be used with any Rack Sessions, instead
of just Rack::Session::Cookie.
Add database files to .gitignore
Merge pull request #954 from kylewlacy/patch-1

Add database files (db/*.db) to .gitignore
[helpers] Rounding is built into 1.9.3
Fixed typo
Merge pull request #962 from matthias-guenther/master

Fixed typo
Don't track the ctags generated tags file
Merge pull request #963 from matthias-guenther/master

gitignore adding for ctags generated tags file
Fix README
Travis image
Updated deps
Update to last Twitter Bootstrap!
Merge pull request #965 from WaYdotNET/pdev

Update to last Twitter Bootstrap!