Sprint 3
Merge branch 'jQuery'

Conflicts:
	js/addressbook.js