better checks
Merge branch 'develop' of github.com:42Zavattas/Field into develop

Conflicts:
	app/scripts/controllers/field.js