SAKIII-4760 add default display settings for embedcontent
SAKIII-4760 add default display settings for embedcontent
SAKIII-4760 moved default options to the embedcontent config.json file and override this in the config.js file
SAKIII-4760 removed default widget config from config.js, fixed valid json file, moved documentation
SAKIII-5319 - Add some more :focus selectors
https://jira.sakaiproject.org/browse/SAKIII-5319
SAKIII-4760 added example in comments
SAKIII-5324 Changed timestamp of SakaiDocs never updates
Merge pull request #1899 from bp323/SAKIII-5324

SAKIII-5324 Changed timestamp of SakaiDocs never updates

* bp323/SAKIII-5324:
  SAKIII-5324 Changed timestamp of SakaiDocs never updates
SAKIII-5321 Scripts embedded in Content Authoring docs are executed if they are entered via Edit HTML

Squashed commit of the following:

commit 986bb47479eb8fa9776dfc1501f506bc2d59c72c
Merge: 7d6c24e 6fd7b77
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Mar 21 10:45:01 2012 -0700

    Merge remote-tracking branch 'bp323/SAKIII-5321' into bp323-SAKIII-5321

commit 6fd7b771ec2248133f5f90ce4642e6304033f391
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 21 11:19:34 2012 +0000

    SAKIII-5321 Scripts embedded in Content Authoring docs are executed if they are entered via Edit HTML

commit 73e76e9f11864faab2844eac3c048c35dafcb0ba
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Mon Mar 19 10:44:00 2012 -0700

    SAKIII-5321 - Allow the src iframe attribute
    https://jira.sakaiproject.org/browse/SAKIII-5321
Merge pull request #1902 from bp323/SAKIII-5321

SAKIII-5321 Scripts embedded in Content Authoring docs are executed if they are entered via Edit HTML
SAKIII-5312 rows/columns rendered in wrong places on a sakai doc

Squashed commit of the following:

commit 5715fa137f697bf81e282b310f9acf2a4784e385
Merge: ddb4d70 871b9eb
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Mar 21 11:57:41 2012 -0700

    Merge remote-tracking branch 'bp323/SAKIII-5312' into bp323-SAKIII-5312

commit 871b9eb77f6138e11c85520f677d39212b22ffd6
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 21 09:46:04 2012 +0000

    SAKIII-5312 Fixes per comment on Github

commit 196d97ee46613fe39e32175dbf66d988fcb1267e
Merge: 8d00fbb 7d6c24e
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Wed Mar 21 09:11:00 2012 +0000

    Merge remote-tracking branch 'origin/1.2.0' into SAKIII-5312

commit 8d00fbbd1aa27df25e2c6f65adfdeeaf0dbe110a
Author: Bert Pareyn <bp323@caret.cam.ac.uk>
Date:   Tue Mar 20 20:52:12 2012 +0000

    SAKIII-5312 rows/columns rendered in wrong places on a sakai doc
Merge pull request #1900 from bp323/SAKIII-5312

SAKIII-5312 rows/columns rendered in wrong places on a sakai doc
Sakiii 5019

Squashed commit of the following:

commit eb82603fc8f09b7bb6dc6e0a01a1441c120e585d
Author: Gonzalo Silverio <gsilver@umich.edu>
Date:   Tue Mar 20 12:49:44 2012 -0400

    SAKIII-5019 - addressing github comments

commit eefaa23e9f76bffa9cdfb20e2df03f588f6f514c
Author: Gonzalo Silverio <gsilver@umich.edu>
Date:   Tue Mar 20 12:42:14 2012 -0400

    SAKIII-5019 - starting afresh
Merge pull request #1896 from gsilver/SAKIII-5019

Sakiii 5019
Sakiii 5279

Squashed commit of the following:

commit ee6deeeecd20e41f3127330a13744018cb664bf1
Merge: 6f0c1b2 70a96a7
Author: Christian Vuerings <vueringschristian@gmail.com>
Date:   Wed Mar 21 19:23:39 2012 -0700

    Merge remote-tracking branch 'lancespeelmon/SAKIII-5279' into lancespeelmon-SAKIII-5279

commit 70a96a72fe5313b3719b4b02a36acc102c35d59b
Author: Lance Speelmon <lance@speelmon.com>
Date:   Fri Mar 9 12:43:16 2012 -0700

    ACAD-829 -Psakai-release build is not hashing content files
    (cherry picked from commit 6026af995c3d54a81b1c99c854d8a73c6e2eb333)

    Signed-off-by: Lance Speelmon <lance@speelmon.com>

commit acd8410d618b2ed59ffb2b2783b8494ce515bbdf
Author: Duffy Gillman <duffy@rsmart.com>
Date:   Fri Mar 9 12:18:47 2012 -0700

    SAKIII-5279 ACAD-829 pointed the ant hash_files task at the newly generated hashfiles jar in tools/hashfiles/target instead of at the maven repo
    (cherry picked from commit b6c9e8ea7b4efaeb458e866f5f51f66d6472e2af)

    Conflicts:

    	build.xml
Merge pull request #1858 from lancespeelmon/SAKIII-5279

SAKIII-5279
SAKIII-5342 - Page revisions are all blank
https://jira.sakaiproject.org/browse/SAKIII-5342
Merge pull request #1909 from christianv/SAKIII-5342

SAKIII-5342 - Page revisions are all blank
SAKIII-5345 Concurrent editing is not blocked for same user, potential loss of data
SAKIII-5067 - Load lhnav on demand
https://jira.sakaiproject.org/browse/SAKIII-5067