contact isAccepted
changes update profile layout
merges contact controls in one contactcontrols.hb
merge contacts
Merge branch 'master' of github.com:sfroestl/onespark_webapp
Merge branch 'master' into record-list

Conflicts:
	source/templates/users/contacts/acceptContact.hb
	source/templates/users/contacts/cancelContact.hb
	source/templates/users/contacts/contacts.hb
	source/templates/users/contacts/removeContact.hb
fixed variables