Conflict solved
Returned avatar_url in authenticated_users method
Changed logo for new public header
Added map_public js to the assets precompile
Changed public info styles
Changed html for new public header
First attempt for refactor public map and table
Removed public dashboard from grunt js files and replaced by map_public
Added styles for public user settings
New styles for new public header
Authenticated user created as a model
Necessary views for new public header
New view class public map created
Delete old public dashboard
Changed .gitignore ignoring .grunt folder
Changed .gitignore ignoring .grunt folder
Removed all unnecessary .grunt files
Delete 20140604161347_add_template_overlays.rb
Recovered crazy egg script in public map view
Fixed bug when tag is selected in public dashboard but that tag didn't appear in the list