added save with achievement for message model && removed activities from development seed data
added smoking and sporting check to sidebar links
Fix for friend
Opt-out fix
Merge branch 'development' of github.com:loed-idzinga/lifefire into development
fixed achievements rake task
Merge branch 'development' of https://github.com/loed-idzinga/lifefire into development
Fix for friend request
Merge branch 'development' of github.com:loed-idzinga/lifefire into development
Create new friendship
Fix specs
Remove AJAX form
Form elements hide/show on selection
Cleanup user model
Analysis#index based upon user_settings
Analysis#index reduced smoke costs
Add DB indexes (migration)
Redirect to analysis index path
Fix delaytime
Fix for calculation for sports kcal