login
Merge branch 'master' of github.com:ferso/Invoix

Conflicts:
	app.js
	provider.js