Add users dropdown to navbar and fixed flash for friends controller
Merge branches 'master' and 'update-navbar'