[H25] resolve differences with master branch
[H25] resolve differences with master branch

zweidner/hubzero-cms,anthonyfuentes/hubzero-cms,zooley/hubzero-cms,anthonyfuentes/hubzero-cms,anthonyfuentes/hubzero-cms,anthonyfuentes/hubzero-cms,zooley/hubzero-cms,zweidner/hubzero-cms,zooley/hubzero-cms,zweidner/hubzero-cms,zweidner/hubzero-cms,zooley/hubzero-cms