updated to near final version of clients, smoother database management, upgrades fully working
fixed conflicts