Bootstrap seem to have changed the alert-dismiss..

Bootstrap seem to have changed the Dismissible alerts syntax (?) to a different way,
http://getbootstrap.com/components/#alerts
Add search api
Integrate search UI and API
Add highlight search terms feature
Search: Filter only messages where from field is not null
add client side code for single bookmarking
write generic function for multiple as well as single bookmarking(front-end)
save bookmark data in db
show bookmarked logs in channel logs
Fix error in main css file after rebase.
Index channel logs in elasticsearch
Add settings variable to decide whether to use ES or not
Add elastic search host in CONFIG
Fix dangling merge conflict in packages' gitignore file.
add bookmarking feature in search page
navbar cosmetic changes

Conflicts:
	app/.meteor/packages
	app/client/index.html
add href to sign out button
create 2-column layout, cosmetic fixed to search bar

Conflicts:
	app/client/search/search.html
align dropdown caret in server and channel
re-modify search template

Conflicts:
	app/client/search/search.html