added some stuff
Merge branch 'master' of https://github.com/katke/farmar-rails
merged some stuff
fixed go to dashboard button, removed your id is message
Merge branch 'master' of https://github.com/katke/farmar-rails
merging stuff