merge
Merge branch 'master' of https://github.com/Pardis89/Prova

Conflicts:
	js/view/ContactsView.js