added floobits
Merge branch 'develop' of https://github.com/diaspora/diaspora into develop
Merge branch 'develop' of https://github.com/diaspora/diaspora into develop
Merge branch 'develop' of https://github.com/diaspora/diaspora into develop
Merge branch 'develop' of https://github.com/diaspora/diaspora into develop
Correct default rails environment
Merge branch 'release/0.4.1.0' into develop
Merge branch 'develop' of https://github.com/diaspora/diaspora into develop
tests for getting and setting to localStorage

update message saveDraft test

refactor message spec to account for get draft method change

added floobits
backbone message model and view
get and set localStorage callbacks

Conflicts:
	app/assets/javascripts/app/views/conversation_view.js

@wip refactor code to incorporate conversations_view

refactor div target for to field with backbone message view

refactor localStorage methods to save message locally

tidy conversations view

change namespace from message to draft for backbone savedraft feature
add changelog for feature: Save blueprint of message on client side using localStorage [#5087]

update changelog link
made correction from message to draft
Merge branch '5087_local_storage_message' of github.com:wegotcoders/diaspora into 5087_local_storage_message

Conflicts:
	app/assets/javascripts/app/views/conversations_view.js
Added if statement to saveDraft
Changed event from keypress to keyup to fix missing last character on save