Contact filter by task
Merge branch 'master' into taskActionContactFilter

Conflicts:
	app/assets/javascripts/angular/controllers/contacts.js
task Action Contact Filter
Remove secret_token (not used after rails 4).

Also fix regex.
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
Add action to tasks in history tab of contacts page
Merge branch 'master' into contactAddressLatLong

Conflicts:
	app/assets/javascripts/angular/controllers/contacts.js
	app/views/contacts/index.html.erb
Merge in master