Added location parameter to .controller function
Merge remote-tracking branch 'origin/Add-contact'

Conflicts:
	contacts.js