This is just a result of uncrustify on ChristianK's code
This commit has the following new features for OPDA:
1.  A new 'Check for Updates' feature has been added.  This is, by default, automatic with a manual option at any time.  The OPDA looks in the bin folder of the current branch for a newer file version than the version that is running.  The user can update, which involves shutting down, running a new updater application and then displaying a message when the new version is launched.
2.  The OPDA now automatically stops the server whenever a new database configuration is saved.
3.  The two checkboxes associated with the YAML file code generation are now saved as part of all the OPDA settings, so thei rvalues persist between sessions instead of always being checked at start-up.
4.  The user is now warned about loss of data if the reset database or recreate database are chosen (unless the current database is nantTest)
5.  Fixed a small bug where the Preview button could remain disabled when it should have been re-enabled.
These changes allow for a auto-populated combo box to have a NULL database value added to the list of options - without actually adding that row to the table.  The comboBox code then works entirely as normal - automatically falling back to the 'empty value' if the user blanks the text area.  So this solves the problem for all the places which use the auto-populated box.
These changes make use of the new feature on 6 screens which get auto-generated correctly by adding the AllowDbNull attribute to the control that has the 'List' defined.  (Note: adding the attribute to a UserDefinedList has no effect).
Merge from trunk.  Just one file with conflicts - codeChecker.cs - but they were all whitepsace and resolved automatically.
Uncrustify the code I merged recently
Fixed the long outstanding issue on Local Partner Data where the grid displays text like float and boolean whereas the options we want to see (and which match what the details panel has been written to show) are Number and Yes/No.

I had thougtht that this would be done with a TypeConverter, so I started with that - but the grid would not use it because there is no need to convert text to text.  Then it looked like it could be done with an Editor (or Model or View or Controller) which might have been possible but in those classes, while it is possible to read what is in the cell iut is not possible to write it.

So in the end I realised it would be simple to do what has been done already in this screen and that is to add a calculated column to the data set and point the grid column to that.  Simples!!
Merge from trunk - no conflicts
Uncrustify after merge
Change wiki URL to https:// and not http://
Change the command line parameter switch from / to - because this should work on both Linux and Windows/  Goint to try it on the build server now.
Mergte from trunk again - no conflicts
Uncrustify after merge
merge from Branch 'lp:~alan-paterson/openpetraorg/2014_holidays_iom'.