fix announcement show page
fix admin search user mysql error
fix make annotation for stuff
optimize annotation index request
Merge branch 'development' of github.com:Coursemology/coursemology.org into development

Conflicts:
	app/views/announcements/show.html.erb