Conflicts:
	sip-core/src/main/java/eu/delving/metadata/AnalysisTreeNode.java
Squashed commit of the following:

commit 325797835d737d6a6bb4f7e9682bef0b477d7899
Merge: 38ba695 3b268fa
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 29 11:33:50 2011 +0100

    Merge branch 'archy' of github.com:delving/sip-creator into archy

commit 3b268facd599c068232cb085dc1e6fb867260419
Author: Thomas Wikman <thomas@wikman.org>
Date:   Mon Nov 28 18:12:34 2011 +0100

    docs now has type as attribute

commit 38ba695180f3282dea2d22293ded80d6db5de18d
Author: Gerald de Jong <gerald@delving.eu>
Date:   Sun Nov 27 18:08:28 2011 +0100

    Bracket placement

commit 5cd8cd67b5400be153f157a4956edf8c06b18274
Author: Gerald de Jong <gerald@delving.eu>
Date:   Sun Nov 27 16:18:22 2011 +0100

    Printing paths

commit 529c8364a828ff6b493657a50e07d1344e9061f2
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 25 22:23:20 2011 +0100

    Nodes being placed like decorations in the rec def tree.

commit 3196a4fa8cda8f0e8344de1e83d1e43b835c6808
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 25 19:38:08 2011 +0100

    Drag'n'drop prototype

commit b55c66610e2e2d68133da588a8a4229d0693d156
Merge: fbaf55c da7ccc7
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 25 18:07:07 2011 +0100

    Merge remote-tracking branch 'origin/archy' into archy

commit da7ccc7c7e07d1329bf69ac0db8c0d6834743d27
Author: zemyatin <eric@delving.eu>
Date:   Fri Nov 25 18:04:24 2011 +0100

    icon update

commit fbaf55c2bedec0c2b3af468d31d8e3a3b9df5317
Merge: 7842dd6 2902cf2
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 25 16:44:50 2011 +0100

    Merge remote-tracking branch 'origin/archy' into archy

commit 2902cf28d204bdf9b7967e1c8b2ea9ca88e8a56c
Merge: 7a77ea6 d35c17c
Author: zemyatin <eric@delving.eu>
Date:   Fri Nov 25 16:28:07 2011 +0100

    Merge branch 'archy' of github.com:delving/sip-creator into archy

commit 7a77ea616b1b932d1f4aaabe0722a3c663597890
Author: zemyatin <eric@delving.eu>
Date:   Fri Nov 25 16:27:47 2011 +0100

    bookmark icons

commit 7842dd63b86af7f4bc0075091542aa75d8d46608
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 25 15:55:00 2011 +0100

    Statistics not expected in analysis tree node

commit d35c17cbe9cc2b3d206dcb81a8c618d03bcdcf24
Author: Thomas Wikman <thomas@wikman.org>
Date:   Fri Nov 25 15:29:31 2011 +0100

    bookmark edit

commit 8ad85a9d82e67f9d0d670aede5b3a96d44189a19
Merge: b923a38 8b78c6d
Author: zemyatin <eric@delving.eu>
Date:   Fri Nov 25 15:16:52 2011 +0100

    Merge branch 'archy' of github.com:delving/sip-creator into archy

commit b923a381f81e2abb7b301680664f452e41e2ce27
Author: zemyatin <eric@delving.eu>
Date:   Fri Nov 25 15:16:18 2011 +0100

    new icons

commit 8b78c6dac5eb60d41382699c46646702c923bcfc
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 25 14:22:18 2011 +0100

    Magic expander built in to the bookmarks tree

commit 7ee7b1cf833e0915119d641b403e4d1927353f67
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 25 14:15:50 2011 +0100

    Magic expander built in to the analysis tree

commit b82d8932c9804cab73e6cd8656767d40257d1eac
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 25 13:40:44 2011 +0100

    HtmlPanel separated off

commit fd42a4d8a9494bbcdb40de5d97e4f3fffd913b15
Author: Thomas Wikman <thomas@wikman.org>
Date:   Fri Nov 25 06:56:23 2011 +0100

    added strings for SPECTRUM

commit 45ec4a42841d7faaa1ef2d4a6295040ccb516db0
Author: Thomas Wikman <thomas@wikman.org>
Date:   Fri Nov 25 06:45:24 2011 +0100

    Added SPECTRUM Object Identification Information

commit ea68ec2e45c06e405b07e06b78972cc50ba94e50
Author: Thomas Wikman <thomas@wikman.org>
Date:   Fri Nov 25 05:25:09 2011 +0100

    Added some documentaion

commit 9843ff0e4de9edbaef00762c304c5dfa2a92e9d5
Author: Gerald de Jong <gerald@delving.eu>
Date:   Thu Nov 24 16:07:11 2011 +0100

    Showing count statistics

commit 167db702be38ec5af3040a7f5343f1f62f7e5ae7
Author: Gerald de Jong <gerald@delving.eu>
Date:   Thu Nov 24 16:03:10 2011 +0100

    Showing statistics.

commit 86fc98a734ca74e5a79c7a3f34165e379dff3afc
Author: Gerald de Jong <gerald@delving.eu>
Date:   Thu Nov 24 15:38:03 2011 +0100

    Refs have docs and options, Categories have docs.

commit 0cff9e4fc6533f310b091a3258a165d61c73b28a
Author: Thomas Wikman <thomas@wikman.org>
Date:   Thu Nov 24 14:03:49 2011 +0100

    Added more bookmarks and options for categories

commit b401e404521e5c4c192de307c0937b53a8be14c6
Merge: 93cbe52 5901b56
Author: Gerald de Jong <gerald@delving.eu>
Date:   Thu Nov 24 13:54:47 2011 +0100

    Merge branch 'archy' of github.com:delving/sip-creator into archy

commit 93cbe52c83f9ca2b28ba03c6fdf8ecec3a1a3c81
Author: Gerald de Jong <gerald@delving.eu>
Date:   Thu Nov 24 13:54:23 2011 +0100

    Bookmark icons

commit 5901b56b8647ea268cf575c36fe4be98da508d36
Author: Thomas Wikman <thomas@wikman.org>
Date:   Thu Nov 24 13:02:43 2011 +0100

    Dummy for DimCon Rijks mandatory fields

    Where do we pit the options?

commit 7d11066d0e8b0a57293fe023bc45e23fd14025b7
Author: Thomas Wikman <thomas@wikman.org>
Date:   Thu Nov 24 12:55:26 2011 +0100

    fixed 2 non-working bookmarks

commit fecf7515879526cdc6e30fe4d016ad418491a4fb
Merge: 79bccd9 2b247eb
Author: Thomas Wikman <thomas@wikman.org>
Date:   Thu Nov 24 12:18:55 2011 +0100

    Merge branch 'archy' of https://github.com/delving/sip-creator into archy

commit 79bccd9af0e4339f4f6a40b09e7b544d0207f2ba
Author: Thomas Wikman <thomas@wikman.org>
Date:   Thu Nov 24 12:18:27 2011 +0100

    Added an example in docs

commit 2b247eb78e9398e849ae427b3ffad90fa5c0c158
Author: Gerald de Jong <gerald@delving.eu>
Date:   Thu Nov 24 12:18:22 2011 +0100

    Bookmarks work!

commit f9c6499a078524d1d423ccff015db20e60f82ad8
Author: Gerald de Jong <gerald@delving.eu>
Date:   Thu Nov 24 11:27:00 2011 +0100

    Stats available in the RecDefViewer

commit 54598873707cf60f1b4f5a9981ddbab52c37f5f7
Author: Gerald de Jong <gerald@delving.eu>
Date:   Thu Nov 24 10:34:26 2011 +0100

    Magic expander/collapser

commit b071d60ea1d641c765a60a35bc2ba85c488fd821
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 16:53:18 2011 +0100

    Corrections to refs

commit 6d404518a4bf29eef6fc3fe8fb16e8ae9c7ba9a6
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 16:25:00 2011 +0100

    Three different icons

commit 74fb1d8734112c3e1889d87d5fd2c4a2d4e9991f
Author: Thomas Wikman <thomas@wikman.org>
Date:   Wed Nov 23 15:21:00 2011 +0100

    Categories updated

commit 43bc75a13875c94c3df011efc0677a789fc42ec6
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 15:13:28 2011 +0100

    Options are now just english again now, because the rest of the program isn't mutlilingual

commit abdf4a60d5405887b27934d7b88eb79d303687d9
Merge: a7c5fde 8b5e30e
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 15:03:49 2011 +0100

    Merge remote-tracking branch 'origin/archy' into archy

commit a7c5fdef8b4be5c2d090b00baa9c719b0cad2d42
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 15:03:31 2011 +0100

    Options are now multilingual

commit 8b5e30e1336eb7317680963678c1bddd792f91cf
Author: Thomas Wikman <thomas@wikman.org>
Date:   Wed Nov 23 14:56:27 2011 +0100

    Edited option format

commit 3aee735c5b4c08beb2b768929b277db22cf45076
Merge: 8d21e00 2a4a0cc
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 14:30:37 2011 +0100

    Merge remote-tracking branch 'origin/archy' into archy

commit 8d21e007c6298b441bb25922eca8b69797b455fc
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 14:14:09 2011 +0100

    RecDefNode created to handle elem/attr/ref

commit 2a4a0cccd49a01c937734fb092558249f5b54edb
Author: Thomas Wikman <thomas@wikman.org>
Date:   Wed Nov 23 13:56:25 2011 +0100

    new option format

commit e5c507d2c9225e8834b8a7979c0b9db06f9f59bb
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 13:34:16 2011 +0100

    Category/Reference added. XStream converters for Path and Tag, and RecDef using them.

commit d0198125b56f702bf73c2c87fdc489185603db76
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 11:20:29 2011 +0100

    Eliminated empty doc entries

commit 7975936f4bf9c0e3e85ba5fe4ab76e247e376006
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 10:48:44 2011 +0100

    Templates were skipped

commit 03dbd68384af794ad0f8ec64388ad5555cee91ed
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 10:31:17 2011 +0100

    Using StringTemplate library for building html

commit d6f383ce4f20945f2a9ffcd5003a4b753252623f
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 23 09:33:25 2011 +0100

    Attributes now showing documentation

commit be0e5ed59e9546e872293b775381b7d66feff744
Author: Thomas Wikman <thomas@wikman.org>
Date:   Wed Nov 23 01:55:48 2011 +0100

    Added some documentation

commit ca3b5242faff35874ca8b3a4024a8c8caab1d8cf
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 22 20:33:10 2011 +0100

    Options separated from elems, views started.

commit 9bbe60dcfaea8a2133faf3c2eb24222ab1d44605
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 22 17:41:43 2011 +0100

    Many more attributes appearing

commit 4683deef01ea7a4d6d1af4f2e0ec659b2cf8dd35
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 22 17:05:25 2011 +0100

    Smaller icons

commit f2d9b94399030f3ae88395ccb65f8e1da5eb34be
Merge: f64a10a 9a07f9d
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 22 16:44:44 2011 +0100

    Merge branch 'archy' of github.com:delving/sip-creator into archy

commit f64a10acf3bdd54b7c002b019b2768444d0b38e5
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 22 16:44:15 2011 +0100

    Showing options.

commit c8a79e14d2343ce231e9872bdbb53ad507e0ed45
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 22 16:37:22 2011 +0100

    Element and Attribute Icons!

commit 9a07f9d2328fec4fafda001a15e2d1de5726db62
Author: Thomas Wikman <thomas@wikman.org>
Date:   Tue Nov 22 16:00:26 2011 +0100

    Proof read

commit 906ef38eb251c2e29c2434552751238e0c053c83
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 22 15:51:44 2011 +0100

    Buttons on the left, some space added.

commit e04bc9809160dec5bea82889eb25fc6ed1223118
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 22 15:32:42 2011 +0100

    Expanding different levels

commit 14477c6ec8184f8b36b3f84f0bd91eee13303800
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 22 13:53:16 2011 +0100

    Leave out AttributeDefinition for now

commit 5efb7ff126aca0e8163b8fef08c1c2bf3e694e46
Merge: cb1c32c ca1a085
Author: Gerald de Jong <gerald@delving.eu>
Date:   Tue Nov 22 13:48:56 2011 +0100

    Merge branch 'master' into archy

commit cb1c32cc3e101dcd8e70738b8d6e9b505de5c530
Author: Gerald de Jong <gerald@delving.eu>
Date:   Mon Nov 21 18:34:45 2011 +0100

    RecDefViewer

commit 7670e078083be6a343fc1f2e4f7bb160a8bca6ef
Author: Gerald de Jong <gerald@delving.eu>
Date:   Mon Nov 21 17:34:12 2011 +0100

    RecDef separated out as top-level class

commit 0b741fab295039004bb1c116cd281b2d70d2e586
Author: Gerald de Jong <gerald@delving.eu>
Date:   Mon Nov 21 15:30:50 2011 +0100

    Documentation added.

commit 2224ab3f1780cd46d0b6fb30723bebb00920286c
Author: Gerald de Jong <gerald@delving.eu>
Date:   Mon Nov 21 15:00:16 2011 +0100

    No need for options="" attribute since options are inline.

commit 1d5bdd6ffa9d1921ede9bf27120a6c0ef32eccfb
Merge: 6b8cb22 e29a6bb
Author: Gerald de Jong <gerald@delving.eu>
Date:   Mon Nov 21 14:56:24 2011 +0100

    Merge branch 'archy' of github.com:delving/sip-creator into archy

commit 6b8cb22dee5116c0864de8883d7c6e351d3bcdac
Author: Gerald de Jong <gerald@delving.eu>
Date:   Mon Nov 21 14:55:28 2011 +0100

    Options are now included as part of the elem.

commit e29a6bb2a91915850f90eab83ea2f640217b0143
Author: Thomas Wikman <thomas@wikman.org>
Date:   Mon Nov 21 12:56:24 2011 +0100

    tw testar igen

commit d788180d432acb4793e90a71f4f0e487effe4982
Author: Thomas Wikman <thomas@wikman.org>
Date:   Mon Nov 21 12:50:55 2011 +0100

    tw testar igen

commit 4862fee61de043fae58694fb350cbb610eb4f447
Author: Thomas Wikman <thomas@wikman.org>
Date:   Mon Nov 21 12:48:36 2011 +0100

    tw testar

commit 1d2fb3c0dd60c27f478392ccece2783ceed67afe
Author: Gerald de Jong <gerald@delving.eu>
Date:   Mon Nov 21 11:09:08 2011 +0100

    Attribute repeatable="true/yes" replaced in the opposite with singular="true".  Using and showing "singular" and "required" attributes.

commit d53521b879548ae2d9fb6e065108cd2551c01117
Author: Gerald de Jong <gerald@delving.eu>
Date:   Mon Nov 21 10:21:23 2011 +0100

    More additions from Thomas

commit 220e45d9ea215674cd74991a842886b856127609
Merge: 388fccb 59abefc
Author: Gerald de Jong <gerald@delving.eu>
Date:   Sun Nov 20 22:16:53 2011 +0100

    Merge branch 'master' into archy

commit 388fccbfd5c656c430bda48a66ff0926ba0c04a9
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 18 17:53:57 2011 +0100

    Thomas' additions to the lido definition.

commit 2c705b5cfdada6b33987b3041d8a69c59ae4937c
Merge: 0a5c6d2 d5d6b1b
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 18 13:03:37 2011 +0100

    Merge branch 'archy' of github.com:delving/sip-creator into archy

commit 0a5c6d247cffa0b63af40a6223d9a8c184a590f0
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 18 09:10:30 2011 +0100

    Refining output

commit 955d10285c140d02605c854b7ca5a2909d7befb6
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 16:39:47 2011 +0100

    Rendering even closer to Groovy

commit e5304f3350b690fede20061ff18f1124a850674e
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 16:00:38 2011 +0100

    Rendering something that looks a lot like Groovy

commit 83bc8c119972b1336759509d7703ecf075b25716
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 14:40:33 2011 +0100

    TestRecDef reads lido-recdef and resolves the attrs and elems attributes

commit c702ef0197ad8aa2906657ab5e43289b0c0669f3
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 12:48:56 2011 +0100

    Reading in the lido-recdef

commit 9e6d6d3eb336fda1dceebe477c759e2cb77221c2
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 12:19:24 2011 +0100

    Refinement of LIDO recdef

commit 6061f84ec6e916db56ab76ff06df36368235170d
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 12:08:40 2011 +0100

    Initial LIDO record definition completed

commit 421054f02521444c246e153243c894e80b9baf83
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 2 10:05:04 2011 +0100

    The LIDO xsd and examples added to test resources

commit e8494ff8fb1a43847bc9ad61e4c4f5e3475cf1fd
Author: Gerald de Jong <gerald@delving.eu>
Date:   Mon Nov 14 13:51:42 2011 +0100

    We will need an AttributeDefinition

commit d5d6b1b7528be55791f959a41c471fbc86abafaa
Author: Gerald de Jong <gerald@delving.eu>
Date:   Fri Nov 18 09:10:30 2011 +0100

    Refining output

commit 14aec5d2b5c3054f2b3c54a650fea08344b139de
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 16:39:47 2011 +0100

    Rendering even closer to Groovy

commit 1ae418256fbddaab22ff0fc7f23871752f8171cc
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 16:00:38 2011 +0100

    Rendering something that looks a lot like Groovy

commit d5b6382992b8fff84da6424aaea359ecd0240b2d
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 14:40:33 2011 +0100

    TestRecDef reads lido-recdef and resolves the attrs and elems attributes

commit 7c86d8e5b01610b173a325d035224b52b9d6582f
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 12:48:56 2011 +0100

    Reading in the lido-recdef

commit c79d6d9c3a7cd283ede0b27f7472a9d3e12895c1
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 12:19:24 2011 +0100

    Refinement of LIDO recdef

commit f85770295ad57ec209d4e261aaac271324c460fb
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 16 12:08:40 2011 +0100

    Initial LIDO record definition completed

commit 2a4a17b0e1d788395c37d0f3fb4e2b714ce97595
Author: Gerald de Jong <gerald@delving.eu>
Date:   Wed Nov 2 10:05:04 2011 +0100

    The LIDO xsd and examples added to test resources

commit 3bd052f72586a2c82642bcdfea7a92afa28b34ae
Author: Gerald de Jong <gerald@delving.eu>
Date:   Mon Nov 14 13:51:42 2011 +0100

    We will need an AttributeDefinition
Safely moving to version 0.5.0
Moving things from test into main where apropriate
Test by reading resource.
Much moving around of things from core that can be in sip-creator, and using new icons for analysis tree.
FieldListModel is gone because mapping will be done on a record definition tree.
RecDefFrame added, and showing in the quick mapping view.
Restoring frame layout
RecDef HTML frame showing and alive
RecDef -> RecDefNode -> RecDefTreeNode, in-between version
RecMapping, NodeMapping, RecDefModel.  RecDefNode carries NodeMapping, RecDefTreeNode carries StatsTreeNode
RecDefViewer revived without statistics
Huge: removed RecordDefinition, RecordMapping, MappingModel, RecordDefinition etc
Important JavaDoc updates and additions to explain what's going on now.
There was no reason for ProgressListener to be in sip-core.
All of the classes in sip-core now updated with proper headers and javadoc.
Adjusting headers
Merge branch 'master' into lido

Conflicts:
	sip-core/src/main/java/eu/delving/metadata/SummaryField.java
	sip-creator/src/main/java/eu/delving/sip/base/OAuthClient.java
	sip-creator/src/main/java/eu/delving/sip/frames/CreateFrame.java
	sip-creator/src/main/java/eu/delving/sip/menus/FileMenu.java
	sip-creator/src/main/java/eu/delving/sip/model/DataSetModel.java
	sip-creator/src/main/java/eu/delving/sip/model/FieldListModel.java
	sip-creator/src/main/java/eu/delving/sip/model/FieldMappingListModel.java
	sip-creator/src/main/java/eu/delving/sip/model/VariableListModel.java
	sip-creator/src/test/groovy/eu/delving/sip/TestMappingEngine.groovy
	sip-creator/src/test/java/eu/delving/sip/MappingRunnerTest.java
	sip-creator/src/test/java/eu/delving/sip/TestStorage.java
	sip-creator/src/test/java/eu/delving/sip/xml/TestSourceConverter.java
Well on the way to generating code.
TestCodeGeneration starting to experiment.