bugfix
Merge branch 'origin/feature-addressbook-concept'

Conflicts:
	app/js/controller/contacts.js
add contact request
Merge branch 'origin/feature-addressbook-concept'

Conflicts:
	app/js/controller/contacts.js
	app/tpl/contacts.html
Merge branch 'origin/feature-addressbook-concept'

Conflicts:
	app/js/controller/contacts.js
	app/tpl/contacts.html