Merge branch 'master' into authentication
tree6ce0b30f8399915a5f55d8a5be2c9e66dd2e37ad
-rw-r--r-- 4 .gitignore
-rw-r--r-- 83 Capfile
-rw-r--r-- 8001 README
-rw-r--r-- 307 Rakefile
drwxr-xr-x - app
drwxr-xr-x - config
drwxr-xr-x - db
drwxr-xr-x - doc
drwxr-xr-x - lib
drwxr-xr-x - log
drwxr-xr-x - public
drwxr-xr-x - script
drwxr-xr-x - spec
drwxr-xr-x - test
drwxr-xr-x - vendor