replace and necessary performBlockAndWait with performBlock
replace any necessary performBlockAndWait with performBlock
Merge branch 'master' of github.com:ninjaatif/idealab_client into dev