Resource Page Bloc
Merge branch 'master' into ResourceBloc