Changed Campaign, Customer entity (took out @Size) and changes TS asked me to make to distribution and production entity
Changed Campaign, Customer entity (took out @Size) and changes TS asked me to make to distribution and production entity retail history and sales history beans, as well as Opcrm for Campaign, and the global HQ to make it work.
web.xml to change welcome page to correct common/ci_user_login_page.xhtml
Merge origin/master