Reference search

Merge changes to navigation drawer and action bar into master branch.