Merge branch 'develop' of github.com:SolidStateGroup/patientview into 121-locked-login

Conflicts:
	root/webapp/app/index.html
Merge branch 'develop' of github.com:SolidStateGroup/patientview into 121-locked-login

Conflicts:
	root/webapp/app/index.html
Added more statistical functionality
Merge branch 'develop' of github.com:SolidStateGroup/patientview into 68-unit-statistics

Conflicts:
	root/data/src/main/java/org/patientview/persistence/model/NewsItem.java
	root/data/src/test/java/org/patientview/test/persistence/repository/NewsRepositoryTest.java
Unstashed changes

Conflicts:
	root/data/src/main/java/org/patientview/persistence/model/NewsItem.java
	root/data/src/test/java/org/patientview/test/persistence/repository/NewsRepositoryTest.java
Merge pull request #44 from SolidStateGroup/68-unit-statistics

68 unit statistics
Fix for index
Fix for test enum
Merge pull request #45 from SolidStateGroup/104-news

104 news
Fix for test cannot match on data
Card #104 - sort group select in order of specialty, unit, disease group
Card #104 - prepersist on save user to set failed logged in attempts to 0 if null, set stats task interval to 5000s, turned off show_sql in persistenceconfig.java
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' into 104-news
Card #104 - specialty admins can see news from child groups under their parent specialty