Title of page now fixed; migrate to Rails 3.2.11; misc. cleanup
iframe resizes to accommodate popup menu and text boxes
Merge branch 'refs/heads/Brendan'

Conflicts:
	app/views/layouts/_frame_top.html.erb
Merge branch 'refs/heads/iframe_resize'
replaced content_tag with javaascript_tag for feedback tab
SASS-ified edit_recipe.css file, fixed edit_recipe resize
reintroduced cburgmer's fixes to tokeninput
Merge branch 'refs/heads/iframe_resize'
removed comment
Elided iframe border
Merge branch 'refs/heads/master' into Brendan
Add and Edit buttons now work in collection
fixed bug that was clipping prompt text
Works on title field
Comment now an expanding text area