Tan changes to index show bookmark_controller for Tagging and sorting and Twitter changes
Bookmark controller changed
fixed typo of pwd
Merge branch 'master' into Tan_0509
Getting Tans branch up to date