Take picture permission added
Big refactor and fixed login again!
merge
More fixes due to git errors!
Merge remote-tracking branch 'origin/master' into sendprocesseddatatohealthcareentity