Commits
Merge branch 'serdar' of https://stash.openntf.org/scm/ct/collaborationtoday-dev into feature/bootstrap3 Conflicts: ODP/XPages/moderateEntry.xsp
Merge branch 'serdar' of https://stash.openntf.org/scm/ct/collaborationtoday-dev into feature/bootstrap3 Conflicts: ODP/XPages/moderateEntry.xsp