adding marionette
adding templates
cats app
Update marionettejs to last version
Merge branch 'twitter-bootstrap' into marionettejs-bootstrap

* twitter-bootstrap:
  Grunt task for bootstrap
  Twitter Bootstrap Init

Conflicts:
	public/index.html
Merge branch 'marionettejs-bootstrap' into usermanager
Merge branch 'persistence' into usermanager
first application
adding dummy component
adding login view
adding she library to client vendors
loading sha1
modify menu
re engineer Application object to avoid dependencies on main, and to add the login method on the app
check if user exist
styling with bootstrap
adding require.js
Merge branch 'master' into usermanager

Conflicts:
	readme.md
Merge branch 'master' into usermanager
fix typo