New Client stuff
Merge branch 'master' of github.com:m0ngr31/address-book into newClient

Conflicts:
	public/js/constants.js
Merge branch 'newClient'