further improvemets
small commit
added a few assets
fixed some rendering bugs
added favourites box
	favourite model and collection with local storage
changed from scss to sass
Merge branch 'dev'

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/backbone/routers/application_router.js.coffee
	app/assets/javascripts/backbone/templates/story_box.jst.eco
	app/assets/javascripts/backbone/views/buttons_view.js.coffee
	app/assets/javascripts/backbone/views/story_box_view.js.coffee

resolved
Merge branch 'dev'

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/backbone/routers/application_router.js.coffee
	app/assets/javascripts/backbone/templates/story_box.jst.eco
	app/assets/javascripts/backbone/views/buttons_view.js.coffee
	app/assets/javascripts/backbone/views/story_box_view.js.coffee

resolved
fresh assets
//Merge branch 'master' of ssh://jobiki.pl/~/rails_apps/jobiki
fixed routing problems
favourite box folding
smaller fixes and enchancements
Added voivodeship and city controllers in rails and backbone respectively

removed cookie support in favour of local storage

modified routes in both bb and ror
fixed routing again
rendering with fadeout - fadein working
footer is fixed and toggleable
other stuff works too
Merge branch 'dev'

Conflicts:
	app/assets/javascripts/backbone/application.js.coffee
	app/assets/javascripts/backbone/routers/application_router.js.coffee
	app/assets/javascripts/backbone/templates/footer.jst.eco
	app/assets/javascripts/backbone/templates/index.jst.eco
	app/assets/javascripts/backbone/templates/story_box.jst.eco
	app/assets/javascripts/backbone/views/footer_view.js.coffee
	app/assets/stylesheets/stories.css.sass
fixed conflicts from merger
more css
add form look
update to 'master'
added loader
add story template is ok
fixed a few bugs
favourites box shown only with story box

added LoadSavedData method for pref loading from localStorage
Merge branch 'dev'

Conflicts:
	app/assets/javascripts/backbone/application.js.coffee
	app/assets/javascripts/backbone/collections/stories_collection.js.coffee
	app/assets/javascripts/backbone/templates/add_story.jst.eco
	app/assets/javascripts/backbone/views/add_story_view.js.coffee
	app/assets/javascripts/backbone/views/buttons_view.js.coffee
	app/assets/javascripts/backbone/views/story_box_view.js.coffee
	app/assets/stylesheets/stories.css.sass

resolved
dev
no message
Merge branch 'dev'
branch 'master'