changes action mananger's reference to tree and allNotesByDepth
fixed basic_spec for action mananger
fixes update_content_spec
fix move note spec
makes create_and_delete spec pass
Merge branch 'master' into Ticket0546

Conflicts:
	app/assets/javascripts/modules/manager/action_manager.coffee
	app/assets/javascripts/modules/note/note_controller.coffee
tries to fix specs
Merge branch 'master' into Ticket0546

Conflicts:
	app/assets/javascripts/modules/manager/offline_access_manager.coffee
tests work (mostly) as does everything else on first pass
:Merge branch 'Ticket0546'

Conflicts:
	app/assets/javascripts/modules/note/note_controller.coffee