Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	patientview-parent/radar/src/main/java/org/patientview/radar/dao/impl/DiseaseGroupDaoImpl.java
Merge branch 'develop' of https://github.com/patientview/patientview into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop
added support for shortcodes in News content e.g. This is another paragraph [link]http://www.bbc.com[/link][linktext]BBC[/linktext] and [bold]bold text[/bold]
cleaner code
better naming
Merge pull request #27 from PatientView/bug/RPV-257

Bug/rpv 257