rake update
update contacts
Merge branch 'master' into develop

Conflicts:
	Rakefile