renamed contacts.all to contacts.getAll
Merge branch 'dev/contacts'

Conflicts:
	contacts.js