Fixed bug with uninstantiated auto_terminal_id. Changed artwork and title to reflect forked version. Removed ui-icons folder from distribution (moved to images folder).

diff --git a/Desktop.ini b/Desktop.ini
deleted file mode 100644
index ae60713..0000000
Binary files a/Desktop.ini and /dev/null differ
diff --git a/config/logo.png b/config/logo.png
old mode 100644
new mode 100755
index e6f58fc..2c6ed04
Binary files a/config/logo.png and b/config/logo.png differ
diff --git a/config/old-logo.png b/config/old-logo.png
deleted file mode 100644
index 34ade36..0000000
Binary files a/config/old-logo.png and /dev/null differ
diff --git a/config/ui_icons/0.png b/config/ui_icons/0.png
deleted file mode 100644
index 37be3c7..0000000
Binary files a/config/ui_icons/0.png and /dev/null differ
diff --git a/config/ui_icons/1.png b/config/ui_icons/1.png
deleted file mode 100644
index 3eacec2..0000000
Binary files a/config/ui_icons/1.png and /dev/null differ
diff --git a/config/ui_icons/2.png b/config/ui_icons/2.png
deleted file mode 100644
index 099ec82..0000000
Binary files a/config/ui_icons/2.png and /dev/null differ
diff --git a/config/ui_icons/3.png b/config/ui_icons/3.png
deleted file mode 100644
index 7aecbe1..0000000
Binary files a/config/ui_icons/3.png and /dev/null differ
diff --git a/config/ui_icons/4.png b/config/ui_icons/4.png
deleted file mode 100644
index f0fbb03..0000000
Binary files a/config/ui_icons/4.png and /dev/null differ
diff --git a/config/ui_icons/5.png b/config/ui_icons/5.png
deleted file mode 100644
index 137cdcc..0000000
Binary files a/config/ui_icons/5.png and /dev/null differ
diff --git a/config/ui_icons/6.png b/config/ui_icons/6.png
deleted file mode 100644
index 453bf38..0000000
Binary files a/config/ui_icons/6.png and /dev/null differ
diff --git a/config/ui_icons/7.png b/config/ui_icons/7.png
deleted file mode 100644
index 2c16868..0000000
Binary files a/config/ui_icons/7.png and /dev/null differ
diff --git a/config/ui_icons/8.png b/config/ui_icons/8.png
deleted file mode 100644
index 3a8bfe2..0000000
Binary files a/config/ui_icons/8.png and /dev/null differ
diff --git a/config/ui_icons/9.png b/config/ui_icons/9.png
deleted file mode 100644
index db6b4b8..0000000
Binary files a/config/ui_icons/9.png and /dev/null differ
diff --git a/config/ui_icons/add+user.png b/config/ui_icons/add+user.png
deleted file mode 100644
index 91a9ae7..0000000
Binary files a/config/ui_icons/add+user.png and /dev/null differ
diff --git a/config/ui_icons/add_user.png b/config/ui_icons/add_user.png
deleted file mode 100644
index 5c40157..0000000
Binary files a/config/ui_icons/add_user.png and /dev/null differ
diff --git a/config/ui_icons/am_ex_card.png b/config/ui_icons/am_ex_card.png
deleted file mode 100644
index a9d36c5..0000000
Binary files a/config/ui_icons/am_ex_card.png and /dev/null differ
diff --git a/config/ui_icons/backoffice.png b/config/ui_icons/backoffice.png
deleted file mode 100644
index 264c00d..0000000
Binary files a/config/ui_icons/backoffice.png and /dev/null differ
diff --git a/config/ui_icons/cancel.png b/config/ui_icons/cancel.png
deleted file mode 100644
index e3279ae..0000000
Binary files a/config/ui_icons/cancel.png and /dev/null differ
diff --git a/config/ui_icons/clear.png b/config/ui_icons/clear.png
deleted file mode 100644
index e9af710..0000000
Binary files a/config/ui_icons/clear.png and /dev/null differ
diff --git a/config/ui_icons/clear_cash.png b/config/ui_icons/clear_cash.png
deleted file mode 100644
index 271896f..0000000
Binary files a/config/ui_icons/clear_cash.png and /dev/null differ
diff --git a/config/ui_icons/clock_out.png b/config/ui_icons/clock_out.png
deleted file mode 100644
index 3a9ffa0..0000000
Binary files a/config/ui_icons/clock_out.png and /dev/null differ
diff --git a/config/ui_icons/cooking-instruction.png b/config/ui_icons/cooking-instruction.png
deleted file mode 100644
index 2a7abd6..0000000
Binary files a/config/ui_icons/cooking-instruction.png and /dev/null differ
diff --git a/config/ui_icons/delete.png b/config/ui_icons/delete.png
deleted file mode 100644
index 1f77ef7..0000000
Binary files a/config/ui_icons/delete.png and /dev/null differ
diff --git a/config/ui_icons/deleteall.png b/config/ui_icons/deleteall.png
deleted file mode 100755
index 1409f37..0000000
Binary files a/config/ui_icons/deleteall.png and /dev/null differ
diff --git a/config/ui_icons/discover_card.png b/config/ui_icons/discover_card.png
deleted file mode 100644
index 55aed13..0000000
Binary files a/config/ui_icons/discover_card.png and /dev/null differ
diff --git a/config/ui_icons/dot.png b/config/ui_icons/dot.png
deleted file mode 100644
index cae8039..0000000
Binary files a/config/ui_icons/dot.png and /dev/null differ
diff --git a/config/ui_icons/down.png b/config/ui_icons/down.png
deleted file mode 100644
index 3134f7c..0000000
Binary files a/config/ui_icons/down.png and /dev/null differ
diff --git a/config/ui_icons/edit_ticket.png b/config/ui_icons/edit_ticket.png
deleted file mode 100644
index c6e3cce..0000000
Binary files a/config/ui_icons/edit_ticket.png and /dev/null differ
diff --git a/config/ui_icons/empty16.png b/config/ui_icons/empty16.png
deleted file mode 100644
index 96729e1..0000000
Binary files a/config/ui_icons/empty16.png and /dev/null differ
diff --git a/config/ui_icons/extraModifier.png b/config/ui_icons/extraModifier.png
deleted file mode 100644
index 695d8a0..0000000
Binary files a/config/ui_icons/extraModifier.png and /dev/null differ
diff --git a/config/ui_icons/extraModifier16.png b/config/ui_icons/extraModifier16.png
deleted file mode 100644
index 2c8f2bf..0000000
Binary files a/config/ui_icons/extraModifier16.png and /dev/null differ
diff --git a/config/ui_icons/finish.png b/config/ui_icons/finish.png
deleted file mode 100644
index 1e2a1f5..0000000
Binary files a/config/ui_icons/finish.png and /dev/null differ
diff --git a/config/ui_icons/floreant-pos.png b/config/ui_icons/floreant-pos.png
deleted file mode 100644
index 34ade36..0000000
Binary files a/config/ui_icons/floreant-pos.png and /dev/null differ
diff --git a/config/ui_icons/florent-pos.png b/config/ui_icons/florent-pos.png
deleted file mode 100644
index abdbeff..0000000
Binary files a/config/ui_icons/florent-pos.png and /dev/null differ
diff --git a/config/ui_icons/header-logo-orig.png b/config/ui_icons/header-logo-orig.png
deleted file mode 100644
index 2b4cec0..0000000
Binary files a/config/ui_icons/header-logo-orig.png and /dev/null differ
diff --git a/config/ui_icons/header-logo.png b/config/ui_icons/header-logo.png
deleted file mode 100644
index 37f9466..0000000
Binary files a/config/ui_icons/header-logo.png and /dev/null differ
diff --git a/config/ui_icons/log_in.png b/config/ui_icons/log_in.png
deleted file mode 100644
index ece5670..0000000
Binary files a/config/ui_icons/log_in.png and /dev/null differ
diff --git a/config/ui_icons/log_out.png b/config/ui_icons/log_out.png
deleted file mode 100644
index 174cf23..0000000
Binary files a/config/ui_icons/log_out.png and /dev/null differ
diff --git a/config/ui_icons/logout.png b/config/ui_icons/logout.png
deleted file mode 100644
index ad82d8c..0000000
Binary files a/config/ui_icons/logout.png and /dev/null differ
diff --git a/config/ui_icons/master_card.png b/config/ui_icons/master_card.png
deleted file mode 100644
index dfd7455..0000000
Binary files a/config/ui_icons/master_card.png and /dev/null differ
diff --git a/config/ui_icons/minus.png b/config/ui_icons/minus.png
deleted file mode 100644
index 6ae4b3d..0000000
Binary files a/config/ui_icons/minus.png and /dev/null differ
diff --git a/config/ui_icons/new_ticket.png b/config/ui_icons/new_ticket.png
deleted file mode 100644
index f476fb2..0000000
Binary files a/config/ui_icons/new_ticket.png and /dev/null differ
diff --git a/config/ui_icons/next.png b/config/ui_icons/next.png
deleted file mode 100644
index f3960ce..0000000
Binary files a/config/ui_icons/next.png and /dev/null differ
diff --git a/config/ui_icons/next_32.png b/config/ui_icons/next_32.png
deleted file mode 100644
index f3960ce..0000000
Binary files a/config/ui_icons/next_32.png and /dev/null differ
diff --git a/config/ui_icons/noModifier.png b/config/ui_icons/noModifier.png
deleted file mode 100644
index a4d2b5f..0000000
Binary files a/config/ui_icons/noModifier.png and /dev/null differ
diff --git a/config/ui_icons/noModifier16.png b/config/ui_icons/noModifier16.png
deleted file mode 100644
index 3e38c01..0000000
Binary files a/config/ui_icons/noModifier16.png and /dev/null differ
diff --git a/config/ui_icons/normalModifier.png b/config/ui_icons/normalModifier.png
deleted file mode 100644
index 1e2a1f5..0000000
Binary files a/config/ui_icons/normalModifier.png and /dev/null differ
diff --git a/config/ui_icons/normalModifier16.png b/config/ui_icons/normalModifier16.png
deleted file mode 100644
index 3d961ae..0000000
Binary files a/config/ui_icons/normalModifier16.png and /dev/null differ
diff --git a/config/ui_icons/pay.png b/config/ui_icons/pay.png
deleted file mode 100644
index 42d7da2..0000000
Binary files a/config/ui_icons/pay.png and /dev/null differ
diff --git a/config/ui_icons/previous.png b/config/ui_icons/previous.png
deleted file mode 100644
index 4576a7d..0000000
Binary files a/config/ui_icons/previous.png and /dev/null differ
diff --git a/config/ui_icons/previous_32.png b/config/ui_icons/previous_32.png
deleted file mode 100644
index 4576a7d..0000000
Binary files a/config/ui_icons/previous_32.png and /dev/null differ
diff --git a/config/ui_icons/print.png b/config/ui_icons/print.png
deleted file mode 100644
index 42f1e71..0000000
Binary files a/config/ui_icons/print.png and /dev/null differ
diff --git a/config/ui_icons/settle_ticket.png b/config/ui_icons/settle_ticket.png
deleted file mode 100644
index 695d8a0..0000000
Binary files a/config/ui_icons/settle_ticket.png and /dev/null differ
diff --git a/config/ui_icons/shut_down.png b/config/ui_icons/shut_down.png
deleted file mode 100644
index 1307b83..0000000
Binary files a/config/ui_icons/shut_down.png and /dev/null differ
diff --git a/config/ui_icons/shutdown.png b/config/ui_icons/shutdown.png
deleted file mode 100644
index 0c65144..0000000
Binary files a/config/ui_icons/shutdown.png and /dev/null differ
diff --git a/config/ui_icons/split.png b/config/ui_icons/split.png
deleted file mode 100644
index 9b3f489..0000000
Binary files a/config/ui_icons/split.png and /dev/null differ
diff --git a/config/ui_icons/title.png b/config/ui_icons/title.png
deleted file mode 100644
index fbffc81..0000000
Binary files a/config/ui_icons/title.png and /dev/null differ
diff --git a/config/ui_icons/up.png b/config/ui_icons/up.png
deleted file mode 100644
index 0ce3567..0000000
Binary files a/config/ui_icons/up.png and /dev/null differ
diff --git a/config/ui_icons/user.png b/config/ui_icons/user.png
deleted file mode 100644
index e0686bd..0000000
Binary files a/config/ui_icons/user.png and /dev/null differ
diff --git a/config/ui_icons/visa_card.png b/config/ui_icons/visa_card.png
deleted file mode 100644
index 455889c..0000000
Binary files a/config/ui_icons/visa_card.png and /dev/null differ
diff --git a/config/ui_icons/void_ticket.png b/config/ui_icons/void_ticket.png
deleted file mode 100644
index ebf71b3..0000000
Binary files a/config/ui_icons/void_ticket.png and /dev/null differ
diff --git a/etc/floreantpos.bat b/etc/floreantpos.bat
deleted file mode 100644
index f0d3ad7..0000000
--- a/etc/floreantpos.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-java -jar floreantpos.jar
\ No newline at end of file
diff --git a/etc/floreantpos_ar.bat b/etc/floreantpos_ar.bat
deleted file mode 100644
index 512863a..0000000
--- a/etc/floreantpos_ar.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-java -jar -Duser.language=ar floreantpos.jar
\ No newline at end of file
diff --git a/etc/floreantpos_de.bat b/etc/floreantpos_de.bat
deleted file mode 100644
index 2e16cba..0000000
--- a/etc/floreantpos_de.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-java -jar -Duser.language=de floreantpos.jar
\ No newline at end of file
diff --git a/etc/floreantpos_es.bat b/etc/floreantpos_es.bat
deleted file mode 100644
index 9f78747..0000000
--- a/etc/floreantpos_es.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-java -jar -Duser.language=es floreantpos.jar
\ No newline at end of file
diff --git a/etc/floreantpos_nl.bat b/etc/floreantpos_nl.bat
deleted file mode 100644
index 5fc912a..0000000
--- a/etc/floreantpos_nl.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo off
-
-java -jar -Duser.language=nl floreantpos.jar
\ No newline at end of file
diff --git a/etc/tavernerpos.bat b/etc/tavernerpos.bat
new file mode 100755
index 0000000..b3a2116
--- /dev/null
+++ b/etc/tavernerpos.bat
@@ -0,0 +1,3 @@
+@echo off
+
+java -jar tavernerpos.jar
\ No newline at end of file
diff --git a/etc/tavernerpos.sh b/etc/tavernerpos.sh
new file mode 100755
index 0000000..c2bd150
--- /dev/null
+++ b/etc/tavernerpos.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar ./floreantpos.jar
diff --git a/etc/tavernerpos_ar.bat b/etc/tavernerpos_ar.bat
new file mode 100755
index 0000000..2e0e0ad
--- /dev/null
+++ b/etc/tavernerpos_ar.bat
@@ -0,0 +1,3 @@
+@echo off
+
+java -jar -Duser.language=ar taverneapos.jar
\ No newline at end of file
diff --git a/etc/tavernerpos_de.bat b/etc/tavernerpos_de.bat
new file mode 100755
index 0000000..75f415f
--- /dev/null
+++ b/etc/tavernerpos_de.bat
@@ -0,0 +1,3 @@
+@echo off
+
+java -jar -Duser.language=de tavernerapos.jar
\ No newline at end of file
diff --git a/etc/tavernerpos_es.bat b/etc/tavernerpos_es.bat
new file mode 100755
index 0000000..04fa9e1
--- /dev/null
+++ b/etc/tavernerpos_es.bat
@@ -0,0 +1,3 @@
+@echo off
+
+java -jar -Duser.language=es tavernerapos.jar
\ No newline at end of file
diff --git a/etc/tavernerpos_nl.bat b/etc/tavernerpos_nl.bat
new file mode 100755
index 0000000..f77eb2a
--- /dev/null
+++ b/etc/tavernerpos_nl.bat
@@ -0,0 +1,3 @@
+@echo off
+
+java -jar -Duser.language=nl tavernerapos.jar
\ No newline at end of file
diff --git a/filters/app.properties b/filters/app.properties
old mode 100644
new mode 100755
index 2df36b4..cdca2ca
--- a/filters/app.properties
+++ b/filters/app.properties
@@ -1 +1 @@
-floreantpos.version = 1.4-build${buildNumber}
\ No newline at end of file
+tavernerpos.version = 1.4-build${buildNumber}
\ No newline at end of file
diff --git a/images/deleteall.png b/images/deleteall.png
new file mode 100755
index 0000000..a39d483
Binary files /dev/null and b/images/deleteall.png differ
diff --git a/images/florent-pos.png b/images/florent-pos.png
old mode 100644
new mode 100755
index abdbeff..32ec296
Binary files a/images/florent-pos.png and b/images/florent-pos.png differ
diff --git a/images/header-logo-orig.png b/images/header-logo-orig.png
old mode 100644
new mode 100755
index 2b4cec0..9905242
Binary files a/images/header-logo-orig.png and b/images/header-logo-orig.png differ
diff --git a/images/header-logo.png b/images/header-logo.png
old mode 100644
new mode 100755
index 37f9466..5f7c656
Binary files a/images/header-logo.png and b/images/header-logo.png differ
diff --git a/images/title.png b/images/title.png
old mode 100644
new mode 100755
index fbffc81..ec0dd84
Binary files a/images/title.png and b/images/title.png differ
diff --git a/images/ui_icons/0.png b/images/ui_icons/0.png
new file mode 100644
index 0000000..37be3c7
Binary files /dev/null and b/images/ui_icons/0.png differ
diff --git a/images/ui_icons/1.png b/images/ui_icons/1.png
new file mode 100644
index 0000000..3eacec2
Binary files /dev/null and b/images/ui_icons/1.png differ
diff --git a/images/ui_icons/2.png b/images/ui_icons/2.png
new file mode 100644
index 0000000..099ec82
Binary files /dev/null and b/images/ui_icons/2.png differ
diff --git a/images/ui_icons/3.png b/images/ui_icons/3.png
new file mode 100644
index 0000000..7aecbe1
Binary files /dev/null and b/images/ui_icons/3.png differ
diff --git a/images/ui_icons/4.png b/images/ui_icons/4.png
new file mode 100644
index 0000000..f0fbb03
Binary files /dev/null and b/images/ui_icons/4.png differ
diff --git a/images/ui_icons/5.png b/images/ui_icons/5.png
new file mode 100644
index 0000000..137cdcc
Binary files /dev/null and b/images/ui_icons/5.png differ
diff --git a/images/ui_icons/6.png b/images/ui_icons/6.png
new file mode 100644
index 0000000..453bf38
Binary files /dev/null and b/images/ui_icons/6.png differ
diff --git a/images/ui_icons/7.png b/images/ui_icons/7.png
new file mode 100644
index 0000000..2c16868
Binary files /dev/null and b/images/ui_icons/7.png differ
diff --git a/images/ui_icons/8.png b/images/ui_icons/8.png
new file mode 100644
index 0000000..3a8bfe2
Binary files /dev/null and b/images/ui_icons/8.png differ
diff --git a/images/ui_icons/9.png b/images/ui_icons/9.png
new file mode 100644
index 0000000..db6b4b8
Binary files /dev/null and b/images/ui_icons/9.png differ
diff --git a/images/ui_icons/add+user.png b/images/ui_icons/add+user.png
new file mode 100644
index 0000000..91a9ae7
Binary files /dev/null and b/images/ui_icons/add+user.png differ
diff --git a/images/ui_icons/add_user.png b/images/ui_icons/add_user.png
new file mode 100644
index 0000000..5c40157
Binary files /dev/null and b/images/ui_icons/add_user.png differ
diff --git a/images/ui_icons/am_ex_card.png b/images/ui_icons/am_ex_card.png
new file mode 100644
index 0000000..a9d36c5
Binary files /dev/null and b/images/ui_icons/am_ex_card.png differ
diff --git a/images/ui_icons/backoffice.png b/images/ui_icons/backoffice.png
new file mode 100644
index 0000000..264c00d
Binary files /dev/null and b/images/ui_icons/backoffice.png differ
diff --git a/images/ui_icons/cancel.png b/images/ui_icons/cancel.png
new file mode 100644
index 0000000..e3279ae
Binary files /dev/null and b/images/ui_icons/cancel.png differ
diff --git a/images/ui_icons/clear.png b/images/ui_icons/clear.png
new file mode 100644
index 0000000..e9af710
Binary files /dev/null and b/images/ui_icons/clear.png differ
diff --git a/images/ui_icons/clear_cash.png b/images/ui_icons/clear_cash.png
new file mode 100644
index 0000000..271896f
Binary files /dev/null and b/images/ui_icons/clear_cash.png differ
diff --git a/images/ui_icons/clock_out.png b/images/ui_icons/clock_out.png
new file mode 100644
index 0000000..3a9ffa0
Binary files /dev/null and b/images/ui_icons/clock_out.png differ
diff --git a/images/ui_icons/cooking-instruction.png b/images/ui_icons/cooking-instruction.png
new file mode 100644
index 0000000..2a7abd6
Binary files /dev/null and b/images/ui_icons/cooking-instruction.png differ
diff --git a/images/ui_icons/delete.png b/images/ui_icons/delete.png
new file mode 100644
index 0000000..1f77ef7
Binary files /dev/null and b/images/ui_icons/delete.png differ
diff --git a/images/ui_icons/deleteall.png b/images/ui_icons/deleteall.png
new file mode 100755
index 0000000..a39d483
Binary files /dev/null and b/images/ui_icons/deleteall.png differ
diff --git a/images/ui_icons/discover_card.png b/images/ui_icons/discover_card.png
new file mode 100644
index 0000000..55aed13
Binary files /dev/null and b/images/ui_icons/discover_card.png differ
diff --git a/images/ui_icons/dot.png b/images/ui_icons/dot.png
new file mode 100644
index 0000000..cae8039
Binary files /dev/null and b/images/ui_icons/dot.png differ
diff --git a/images/ui_icons/down.png b/images/ui_icons/down.png
new file mode 100644
index 0000000..3134f7c
Binary files /dev/null and b/images/ui_icons/down.png differ
diff --git a/images/ui_icons/edit_ticket.png b/images/ui_icons/edit_ticket.png
new file mode 100644
index 0000000..c6e3cce
Binary files /dev/null and b/images/ui_icons/edit_ticket.png differ
diff --git a/images/ui_icons/empty16.png b/images/ui_icons/empty16.png
new file mode 100644
index 0000000..96729e1
Binary files /dev/null and b/images/ui_icons/empty16.png differ
diff --git a/images/ui_icons/extraModifier.png b/images/ui_icons/extraModifier.png
new file mode 100644
index 0000000..695d8a0
Binary files /dev/null and b/images/ui_icons/extraModifier.png differ
diff --git a/images/ui_icons/extraModifier16.png b/images/ui_icons/extraModifier16.png
new file mode 100644
index 0000000..2c8f2bf
Binary files /dev/null and b/images/ui_icons/extraModifier16.png differ
diff --git a/images/ui_icons/finish.png b/images/ui_icons/finish.png
new file mode 100644
index 0000000..1e2a1f5
Binary files /dev/null and b/images/ui_icons/finish.png differ
diff --git a/images/ui_icons/floreant-pos.png b/images/ui_icons/floreant-pos.png
new file mode 100644
index 0000000..34ade36
Binary files /dev/null and b/images/ui_icons/floreant-pos.png differ
diff --git a/images/ui_icons/florent-pos.png b/images/ui_icons/florent-pos.png
new file mode 100755
index 0000000..32ec296
Binary files /dev/null and b/images/ui_icons/florent-pos.png differ
diff --git a/images/ui_icons/header-logo-orig.png b/images/ui_icons/header-logo-orig.png
new file mode 100755
index 0000000..9905242
Binary files /dev/null and b/images/ui_icons/header-logo-orig.png differ
diff --git a/images/ui_icons/header-logo.png b/images/ui_icons/header-logo.png
new file mode 100755
index 0000000..5f7c656
Binary files /dev/null and b/images/ui_icons/header-logo.png differ
diff --git a/images/ui_icons/log_in.png b/images/ui_icons/log_in.png
new file mode 100644
index 0000000..ece5670
Binary files /dev/null and b/images/ui_icons/log_in.png differ
diff --git a/images/ui_icons/log_out.png b/images/ui_icons/log_out.png
new file mode 100644
index 0000000..174cf23
Binary files /dev/null and b/images/ui_icons/log_out.png differ
diff --git a/images/ui_icons/logout.png b/images/ui_icons/logout.png
new file mode 100644
index 0000000..ad82d8c
Binary files /dev/null and b/images/ui_icons/logout.png differ
diff --git a/images/ui_icons/master_card.png b/images/ui_icons/master_card.png
new file mode 100644
index 0000000..dfd7455
Binary files /dev/null and b/images/ui_icons/master_card.png differ
diff --git a/images/ui_icons/minus.png b/images/ui_icons/minus.png
new file mode 100644
index 0000000..6ae4b3d
Binary files /dev/null and b/images/ui_icons/minus.png differ
diff --git a/images/ui_icons/new_ticket.png b/images/ui_icons/new_ticket.png
new file mode 100644
index 0000000..f476fb2
Binary files /dev/null and b/images/ui_icons/new_ticket.png differ
diff --git a/images/ui_icons/next.png b/images/ui_icons/next.png
new file mode 100644
index 0000000..f3960ce
Binary files /dev/null and b/images/ui_icons/next.png differ
diff --git a/images/ui_icons/next_32.png b/images/ui_icons/next_32.png
new file mode 100644
index 0000000..f3960ce
Binary files /dev/null and b/images/ui_icons/next_32.png differ
diff --git a/images/ui_icons/noModifier.png b/images/ui_icons/noModifier.png
new file mode 100644
index 0000000..a4d2b5f
Binary files /dev/null and b/images/ui_icons/noModifier.png differ
diff --git a/images/ui_icons/noModifier16.png b/images/ui_icons/noModifier16.png
new file mode 100644
index 0000000..3e38c01
Binary files /dev/null and b/images/ui_icons/noModifier16.png differ
diff --git a/images/ui_icons/normalModifier.png b/images/ui_icons/normalModifier.png
new file mode 100644
index 0000000..1e2a1f5
Binary files /dev/null and b/images/ui_icons/normalModifier.png differ
diff --git a/images/ui_icons/normalModifier16.png b/images/ui_icons/normalModifier16.png
new file mode 100644
index 0000000..3d961ae
Binary files /dev/null and b/images/ui_icons/normalModifier16.png differ
diff --git a/images/ui_icons/pay.png b/images/ui_icons/pay.png
new file mode 100644
index 0000000..42d7da2
Binary files /dev/null and b/images/ui_icons/pay.png differ
diff --git a/images/ui_icons/previous.png b/images/ui_icons/previous.png
new file mode 100644
index 0000000..4576a7d
Binary files /dev/null and b/images/ui_icons/previous.png differ
diff --git a/images/ui_icons/previous_32.png b/images/ui_icons/previous_32.png
new file mode 100644
index 0000000..4576a7d
Binary files /dev/null and b/images/ui_icons/previous_32.png differ
diff --git a/images/ui_icons/print.png b/images/ui_icons/print.png
new file mode 100644
index 0000000..42f1e71
Binary files /dev/null and b/images/ui_icons/print.png differ
diff --git a/images/ui_icons/settle_ticket.png b/images/ui_icons/settle_ticket.png
new file mode 100644
index 0000000..695d8a0
Binary files /dev/null and b/images/ui_icons/settle_ticket.png differ
diff --git a/images/ui_icons/shut_down.png b/images/ui_icons/shut_down.png
new file mode 100644
index 0000000..1307b83
Binary files /dev/null and b/images/ui_icons/shut_down.png differ
diff --git a/images/ui_icons/shutdown.png b/images/ui_icons/shutdown.png
new file mode 100644
index 0000000..0c65144
Binary files /dev/null and b/images/ui_icons/shutdown.png differ
diff --git a/images/ui_icons/split.png b/images/ui_icons/split.png
new file mode 100644
index 0000000..9b3f489
Binary files /dev/null and b/images/ui_icons/split.png differ
diff --git a/images/ui_icons/title.png b/images/ui_icons/title.png
new file mode 100755
index 0000000..ec0dd84
Binary files /dev/null and b/images/ui_icons/title.png differ
diff --git a/images/ui_icons/up.png b/images/ui_icons/up.png
new file mode 100644
index 0000000..0ce3567
Binary files /dev/null and b/images/ui_icons/up.png differ
diff --git a/images/ui_icons/user.png b/images/ui_icons/user.png
new file mode 100644
index 0000000..e0686bd
Binary files /dev/null and b/images/ui_icons/user.png differ
diff --git a/images/ui_icons/visa_card.png b/images/ui_icons/visa_card.png
new file mode 100644
index 0000000..455889c
Binary files /dev/null and b/images/ui_icons/visa_card.png differ
diff --git a/images/ui_icons/void_ticket.png b/images/ui_icons/void_ticket.png
new file mode 100644
index 0000000..ebf71b3
Binary files /dev/null and b/images/ui_icons/void_ticket.png differ
diff --git a/images/ui_icons/wide logo with title.png b/images/ui_icons/wide logo with title.png
new file mode 100755
index 0000000..ec0dd84
Binary files /dev/null and b/images/ui_icons/wide logo with title.png differ
diff --git a/pom.xml b/pom.xml
old mode 100644
new mode 100755
index b605453..0a09d0a
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.floreantpos</groupId>
 	<artifactId>floreantpos</artifactId>
-	<version>1.4-SNAPSHOT</version>
+	<version>1.4-TavernerPOS</version>

 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -14,7 +14,7 @@

 	<build>
 		<sourceDirectory>src</sourceDirectory>
-		<finalName>floreantpos</finalName>
+		<finalName>tavernerPOS</finalName>
 		<resources>
 			<resource>
 				<directory>src</directory>
diff --git a/resources/META-INF/mvn-assembly.xml b/resources/META-INF/mvn-assembly.xml
old mode 100644
new mode 100755
index a646e66..67b84b6
--- a/resources/META-INF/mvn-assembly.xml
+++ b/resources/META-INF/mvn-assembly.xml
@@ -38,7 +38,8 @@
 			<outputDirectory></outputDirectory>
 			<filtered>true</filtered>
 			<includes>
-				<include>floreantpos.bat</include>
+				<include>tavernerpos.bat</include>
+				<include>tavernerpos.sh</include>
 			</includes>
 		</fileSet>
 		<fileSet>
diff --git a/resources/icons/fp_logo128x128.png b/resources/icons/fp_logo128x128.png
old mode 100644
new mode 100755
index b47f10a..3b4e467
Binary files a/resources/icons/fp_logo128x128.png and b/resources/icons/fp_logo128x128.png differ
diff --git a/resources/icons/icon.png b/resources/icons/icon.png
old mode 100644
new mode 100755
index df5bbf8..5507ca2
Binary files a/resources/icons/icon.png and b/resources/icons/icon.png differ
diff --git a/resources/images/deleteall.png b/resources/images/deleteall.png
new file mode 100755
index 0000000..a39d483
Binary files /dev/null and b/resources/images/deleteall.png differ
diff --git a/resources/images/florent-pos.png b/resources/images/florent-pos.png
old mode 100644
new mode 100755
index abdbeff..32ec296
Binary files a/resources/images/florent-pos.png and b/resources/images/florent-pos.png differ
diff --git a/resources/images/header-logo-orig.png b/resources/images/header-logo-orig.png
old mode 100644
new mode 100755
index 2b4cec0..9905242
Binary files a/resources/images/header-logo-orig.png and b/resources/images/header-logo-orig.png differ
diff --git a/resources/images/header-logo.png b/resources/images/header-logo.png
old mode 100644
new mode 100755
index 37f9466..5f7c656
Binary files a/resources/images/header-logo.png and b/resources/images/header-logo.png differ
diff --git a/resources/images/open_initiative.png b/resources/images/open_initiative.png
old mode 100644
new mode 100755
index 876ceb3..c14d9ae
Binary files a/resources/images/open_initiative.png and b/resources/images/open_initiative.png differ
diff --git a/resources/images/title.png b/resources/images/title.png
old mode 100644
new mode 100755
index fbffc81..ec0dd84
Binary files a/resources/images/title.png and b/resources/images/title.png differ
diff --git a/src/com/floreantpos/config/AppProperties.java b/src/com/floreantpos/config/AppProperties.java
old mode 100644
new mode 100755
index f83dae1..547feae
--- a/src/com/floreantpos/config/AppProperties.java
+++ b/src/com/floreantpos/config/AppProperties.java
@@ -15,7 +15,7 @@ public class AppProperties {
 	}

 	public static String getVersion() {
-		return properties.getString("floreantpos.version"); //$NON-NLS-1$
+		return properties.getString("tavernerpos.version"); //$NON-NLS-1$

 	}
 }
diff --git a/src/com/floreantpos/config/TerminalConfig.java b/src/com/floreantpos/config/TerminalConfig.java
index d734c09..52080ef 100755
--- a/src/com/floreantpos/config/TerminalConfig.java
+++ b/src/com/floreantpos/config/TerminalConfig.java
@@ -52,7 +52,7 @@ public class TerminalConfig {

 	public static int getTerminalId() {

-		if (config.getBoolean(AUTOTERMINAL_ID)==true) {
+		if (isAutoTerminalID()==true) {
 			int terminalID=NetInfo.getTerminalIDFromMACAddr();
 			if (terminalID!=-1l) {
 				return(terminalID);
diff --git a/src/com/floreantpos/main/Application.java b/src/com/floreantpos/main/Application.java
index a8995fd..aac0ca6 100755
--- a/src/com/floreantpos/main/Application.java
+++ b/src/com/floreantpos/main/Application.java
@@ -465,7 +465,7 @@ public class Application {
 	}

 	public static String getTitle() {
-		return "Floreant POS - Version " + VERSION; //$NON-NLS-1$
+		return "TavernerPOS - Version " + VERSION; //$NON-NLS-1$
 	}

 	public static ImageIcon getApplicationIcon() {
diff --git a/src/com/floreantpos/ui/dialog/AboutDialog.java b/src/com/floreantpos/ui/dialog/AboutDialog.java
old mode 100644
new mode 100755
index 3942ad0..f6bcce7
--- a/src/com/floreantpos/ui/dialog/AboutDialog.java
+++ b/src/com/floreantpos/ui/dialog/AboutDialog.java
@@ -27,7 +27,7 @@ public class AboutDialog extends POSDialog {
 		JLabel logoLabel = new JLabel(IconFactory.getIcon("/icons/", "fp_logo128x128.png")); //$NON-NLS-1$ //$NON-NLS-2$
 		contentPanel.add(logoLabel, BorderLayout.WEST);

-		JLabel l = new JLabel("<html><center><h1>Floreant POS</h1><br/><h2>Version " + Application.VERSION + "</h2></center></html>"); //$NON-NLS-1$ //$NON-NLS-2$
+		JLabel l = new JLabel("<html><center><h1>TavernerPOS</h1><br/><h2>Version " + Application.VERSION + "</h2></center></html>"); //$NON-NLS-1$ //$NON-NLS-2$
 		contentPanel.add(l);

 		JPanel buttonPanel = new JPanel();
diff --git a/src/com/mercurypay/ws/sdk/mercuryAuth.xml b/src/com/mercurypay/ws/sdk/mercuryAuth.xml
old mode 100644
new mode 100755
index 7daafa9..fc53147
--- a/src/com/mercurypay/ws/sdk/mercuryAuth.xml
+++ b/src/com/mercurypay/ws/sdk/mercuryAuth.xml
@@ -6,7 +6,7 @@
 		<TranCode>$tranCode</TranCode>
 		<InvoiceNo>$invoiceNo</InvoiceNo>
 		<RefNo>$refNo</RefNo>
-		<Memo>FloreantPOS-1.4</Memo>
+		<Memo>TavernerPOS-1.4</Memo>
 		<PartialAuth>Allow</PartialAuth>
 		<Frequency>OneTime</Frequency>
 		<RecordNo>RecordNumberRequested</RecordNo>
diff --git a/src/com/mercurypay/ws/sdk/mercuryPreAuthCapture.xml b/src/com/mercurypay/ws/sdk/mercuryPreAuthCapture.xml
old mode 100644
new mode 100755
index b8b20cf..75b9781
--- a/src/com/mercurypay/ws/sdk/mercuryPreAuthCapture.xml
+++ b/src/com/mercurypay/ws/sdk/mercuryPreAuthCapture.xml
@@ -6,7 +6,7 @@
 		<TranCode>PreAuthCaptureByRecordNo</TranCode>
 		<InvoiceNo>$invoiceNo</InvoiceNo>
 		<RefNo>$refNo</RefNo>
-		<Memo>FloreantPOS-1.4</Memo>
+		<Memo>TavernerPOS-1.4</Memo>
 		<PartialAuth>Allow</PartialAuth>
 		<Frequency>OneTime</Frequency>
 		<RecordNo>$recordNo</RecordNo>