Merge pull request #1 from baasbox/master

update from origin
Merge pull request #2 from baasbox/master

update from origin
better handling of the missing email field for the reset password feature
Merge branch 'master' of https://github.com/giastfader/baasbox
Merge pull request #48 from swampie/master

access.log
news feed in console
Merge pull request #49 from swampie/master

access log in scala
Merge pull request #50 from giastfader/master

news feed in console
fixed the console logout link
Merge pull request #51 from giastfader/master

fixed the console logout link
Add a Bitdeli badge to README
Merge pull request #52 from bitdeli-chef/master

Add a Bitdeli Badge to README
Merge pull request #3 from baasbox/master

update from origin repo
MANY CONSOLE FIXING

Many annoying admin console fixes.
Such as:
 * In case of expired session token, now an alert is shown and the console is reloaded
 * The session token is now automatically refreshed every 14 minutes
 * The links to download assets are fixed. The AppCode was missing in the querystring
 * A more "elegant" message is shown where an error is thrown by the server
 * A "Collection already exists" message is shown when a collection is created twice
FIX THE COLLECTIONS DROPDOWN IN THE DOCUMENTS PAGE

There were some annoying bugs in the Documents page.

 * Clean the document's table when the page is shown
 * Added a "refresh" icon/button on the table header to reload the table
Merge pull request #53 from giastfader/master

Console Fixes
AVOID EXPIRATION OF SESSION TOKENS

Now the administrator can, via specific setting, set how long a token is valid before expiration.
Setting this value to 0 disable the tokens expiration.
The value is now 0.
Merge pull request #54 from giastfader/master

AVOID EXPIRATION OF SESSION TOKENS
Improved guessing on file asset content-type

fixed #26
Merge pull request #55 from giastfader/master

Improved guessing on file asset content-type