Contact filter by task
Merge branch 'master' into taskActionContactFilter

Conflicts:
	app/assets/javascripts/angular/controllers/contacts.js
task Action Contact Filter
Merge branch 'master' into taskActionContactFilter

Conflicts:
	app/assets/javascripts/angular/controllers/contacts.js
merge with master
Include 'None" in default contact filter
Merge pull request #79 from CruGlobal/taskActionContactFilter

Task action contact filter