Merge branch 'master' into develop
Review @ Coding Standards.
case 2276 - New bookmark handling because of flag module update.
Case 2529 - Modified bookmarks to work with no-js.
Merge branch 'case-2276' into develop
Merge branch 'case-2529' into develop

* case-2529:
  Case 2529 - Modified bookmarks to work with no-js.
Merge remote-tracking branch 'origin/develop'