Merge pull request #124 from SolidStateGroup/milestone-5

Milestone 5
fix for delete from my groups (todo: more secure method)
Merge remote-tracking branch 'origin/develop' into develop
Card #189 email uses updated template (header/footer in properties file, consider better templating method?)
Merge branch 'develop' of github.com:SolidStateGroup/patientview into milestone-5