Updated CHANGES

diff --git a/CHANGES b/CHANGES
index a968445..7804e35 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,134 @@
+commit 973fc7f22b7aced39274f53dd14d48b9d9131b28
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Tue Mar 29 17:32:40 2016 +0100
+
+    Corrected inclusive VAT to store correct net values so reports are correct. Added option to add hours to working day so if you shut at 4AM your reports make sense.
+
+commit 69d9cf4eb117c96c6d068d030bdec906b6b9d786
+Author: Matthew Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Tue Mar 29 12:28:56 2016 +0100
+
+    Start Fixing the incorrect Tax calculations when tax is inclusive.
+
+commit 30c058258f19ae8a19beccb9128265cd2768da53
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Mon Jan 11 19:26:29 2016 +0000
+
+    Add option to allow blank buttons defined by a '-' as the menu item name. These are set as invisible when the MenuItemView is rendered and allow for creating column layouts using the Sort Order field
+
+commit 4663347c5b47b6994c4a790f0694b063149e2d51
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Mon Jan 11 16:51:33 2016 +0000
+
+    Fix missing Button Colour wording (i18n) on Menu Explorer - Edit Menu Item
+
+commit 218a29f89ee0cbbdcdbf027019323c5a70a610b3
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Mon Jan 11 15:41:21 2016 +0000
+
+    Fix missing wording (i18n) on Menu Explorer
+
+commit 3218254592a9fff9bf5d0ba03f8b3229514ce659
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Sun Jan 10 14:40:29 2016 +0000
+
+    Add option to automatically fill in Card Authorisation Code with timestamp for external card terminals
+
+commit 82e504ba54587f9fe233ef89a3ab3761e25e2185
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Fri Jan 8 17:13:47 2016 +0000
+
+    Add facility to automatically open new TAKE OUT (Bar Sale) ticket if no existing tickets are present
+
+commit 5e1cf1646687d063199ded6e04feeaddc4aa181f
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Fri Jan 8 15:34:37 2016 +0000
+
+    Add label to OrderTypes UI dialog to indicate that TAKE_OUT is used as Bar Sale. Enum types are not changed throughout the system to maintain compatibility with FloreantPos
+
+commit 85a827e02da6442eb8cebe8dc5dc09d0fd7dfb18
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Fri Jan 8 14:56:12 2016 +0000
+
+    Add option to automatically close Order Summary (Transaction Complete) after a user specified delay - set in Terminal Config)
+
+commit ef64cae931dcfd3487262d529133401ac29d1ed3
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Mon Dec 7 11:24:18 2015 +0000
+
+    Backport fix for menu-items import/export.
+
+commit e28ca06efb55c3bda55db44a3417081d851f0bd1
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Thu Dec 3 17:26:27 2015 +0000
+
+    Added drawer kick to draw pull, payout, cash drop and draw assignments.
+    Resized drawer-pull report for 58mm printer (in printerlayouts, remove to use original)
+    Resized generic-receipt and refund receipt to 58mm.
+
+commit 695939d0d014b570b3d6edcdb26a9140647610d4
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Thu Dec 3 14:40:54 2015 +0000
+
+    Internationalise dates in messages.properties.
+    Create new locale messages_en_GB.properites and correct Americanised spellings.
+    Add new messages fields to other locale files (needs internationalisation).
+    Modify Linux start script to automatically detect locale.
+    Add GB start-up batch file.
+    Fix receipt-ticket report bug where minute was not padded <10 mins in to hour.
+
+commit 339ee18f7faa0d32105c3169c1a2d5f36d03cae1
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Thu Dec 3 12:35:05 2015 +0000
+
+    Add Receipt Ticket logo: config/receipt-logo.jpg (386x269px) and modify ticket-receipt.jrxml and .jasper to support it. Add sample logo. User can change this JPEG to add own logo.
+
+commit c68789a567cb7d5b0a81a6d68347147854e3a3c0
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Thu Dec 3 00:45:30 2015 +0000
+
+    Fix Windows batch file error.
+    Refactor Terminal ID MAC address system to not try and enumerate loopback (which is was doing on Debian Systems).
+
+commit ce1738b7ef3b0885b4460537bbc10cbbf68bac92
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Wed Dec 2 22:37:28 2015 +0000
+
+    PaymentView - Clear text when entering tfAmountTendered if tfAmountTendered has selected text.
+
+commit 0dcc88adcc87feec9150abfb0ec1bc486a170a93
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Wed Dec 2 22:27:45 2015 +0000
+
+    Kick-drawer now automatic printing ticket printing is disabled
+
+commit 20b1ca61ec01df2da190bd7c8cf2919f3d1f7381
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Wed Dec 2 21:27:27 2015 +0000
+
+    Prevent printing of ticket-receipt by default on payment screen.
+    Change DrawerUtil behaviour to write to a file on linux (instead of serialPort).
+    Remove border from ticket-receipt for 58mm printer with fixed margin (in config/printerlayout only).
+    Escape Drawer Kick codes so they save correctly in TerminalConfig.
+    Update default logo graphics.
+
+commit 985e8dd69ce91646f4d309aad8b0c8c99ba26770
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Tue Nov 24 23:03:35 2015 +0000
+
+    Update some logo artwork
+
+commit 05819a7d957ac58894a33f4c4e25102435b1cd23
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Mon Nov 23 20:32:53 2015 +0000
+
+    Fix error in startup scripts attemping to launch wrong file
+
+commit 5a0a0dc0ec97d2d0880f9832cd82b54cee3b5c99
+Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
+Date:   Mon Nov 9 14:17:25 2015 +0000
+
+    Updated CHANGES, create new version scheme
 commit 39e589f05cb080353bdb74c822141734ee7dbedb
 Author: Matt Smith <This email address is being protected from spambots. You need JavaScript enabled to view it.>
 Date:   Mon Nov 9 13:52:46 2015 +0000
diff --git a/floreantpos.config.properties b/floreantpos.config.properties
deleted file mode 100755
index 9e78189..0000000
--- a/floreantpos.config.properties
+++ /dev/null
@@ -1,49 +0,0 @@
-# written by PropertiesConfiguration
-# Thu Mar 31 16:29:56 BST 2016
-
-database_provider_name = MySQL
-connection_string = jdbc:mysql://192.168.129.101:3306/epos?characterEncoding=UTF-8
-database_url = 192.168.129.101
-database_port = 3306
-database_name = epos
-database_user = root
-database_pass = Chevron3641!!$
-support-swipe-card = false
-support-card-manual-entry = true
-support-ext-terminal = true
-CARD_READER = EXTERNAL_TERMINAL
-MerchantGateway = AUTHORIZE_NET
-MerchantAccount = 6tuU4N3H
-MerchantPass = qf9cIKiQdjGhOBjNTn+/rEhw/lFbiofDyxnO0LO/zsw=
-sandboxMode = true
-AUTO_FILL_CARD_AUTH = true
-bartablimit = 25.0
-show_table_selection = true
-show_guest_selection = true
-terminal_id = 180
-DEFAULT_PASS_LEN = 4
-EXTEND_DAY_BY_HOURS = 4
-fullscreen_mode = false
-auto_open_takeout_ticket = true
-show_db_configuration = false
-use_translated_name = false
-TOUCH_BUTTON_HEIGHT = 80
-TOUCH_FONT_SIZE = 12
-AUTO_LOGOFF_ENABLE = true
-AUTO_LOGOFF_TIME = 60
-AUTO_CLOSESUMMARY_ENABLE = true
-AUTO_CLOSESUMMARY_TIME = 30
-auto_save_and_open = true
-auto_terminal_id = false
-UseSettlementPrompt = false
-drawerPortName = /dev/usb/lp0
-controlCode = 27\,112\,0\,25\,250
-bwwidth = 900
-bwheight = 650
-bwx = 190
-bwy = 187
-wwidth = 1296
-wheight = 979
-wlocx = -8
-wlocy = -8
-extendedstate = 6