style cleaning
Merge branch 'master' of github.com:aenario/cozy-contacts

Conflicts:
	client/app/views/doc.coffee
	client/public/javascripts/app.js
1.0.0
resilience