removed references to Mvc2Futures
Merge branch 'dev' into dev-webapi