rename function
update predicate
move necessary stuff from email construction function
Merge branch 'dev' of github.com:ninjaatif/idealab_client into dev
Merge branch 'master' of github.com:ninjaatif/idealab_client into dev