Sprint 2
Merge branch 'breakJSON-Ajax'

Conflicts:
	js/addressbook.js