added setup settings
Merge branch 'master' of https://github.com/loed-idzinga/lifefire
fixed grid css
Merge pull request #5 from loed-idzinga/rebuild-style

fixed grid css
fixed components border showing
removed margin from notifcations
added user id to users
Merge pull request #6 from loed-idzinga/cleanup

Cleanup
Merge branch 'master' into ajax-requests

Conflicts:
	app/views/shared/_smoking.html.slim
	app/views/shared/_sport.html.slim
changed
Split JS in folders (application/basic)
Add route for message#count, and graphical ui
Changed graphs url
Changed scripttags
Check only one time if user may view something (analysis#index)
Add count method for messages
Add remote true for forms
Check only user when login (or else do setup)
Graphs methods
Merge branch 'master' into ajax-requests