Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
Merge branch 'Production'

# By Buddhika (4) and Dr. M H B Ariyaratne (2)
# Via Dr. M H B Ariyaratne (2) and Buddhika (1)
* Production:
  A bug in a
  Menu OK. Display Pages Created
  Menu changes Labels in sinhala, tamil, english
  Inventory buddylap
  buddhypc changes
  Added two fields. For class Letter

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties

Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

# By Niluka (5) and others
# Via buddhika75 (2) and others
* 'master' of https://github.com/pdhssp/HealthOffice.git:
  Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
  Major Changes in Class Strucuture
  Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
  Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
  NewFilesImportedToWorkingProjectWithoutLibrary issues
  error in merging
  Signed-off-by: Niluka <niluka.ari@gmail.com>
  Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
  buddy pc local changes
  Articles updated
  local changes

Conflicts:
	nbproject/genfiles.properties
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	src/conf/persistence.xml
Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
Merge branch 'master' of https://github.com/pdhssp/HealthOffice.git

# By buddhika (2) and buddhika75 (1)
# Via buddhika
* 'master' of https://github.com/pdhssp/HealthOffice.git:
  Signed-off-by: buddhika <buddhika.ari@gmail.com>
  Translation By Deepika
  Signed-off-by: buddhika75 <buddhika.ari@gmail.com>

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
	nbproject/project.properties
	src/conf/persistence.xml

Signed-off-by: buddhika75 <buddhika.ari@gmail.com>
Signed-off-by: buddhika75 <buddhika.ari@gmail.com>