projekt change
Merge branch 'master' of github.com:o-zander/as-projekt-2014-health-records
move some functions