testing with javascript frameworks
Merge branch 'master' of github.com:laclasse-com/service-annuaire
Angular mockup
starting the modification of etablissement api to enable search
Merge branch 'master' of github.com:laclasse-com/service-annuaire

Conflicts:
	api/user.rb
search  etablissement api

needs to add tests and joins
Remove canjs and  backbone files