Merge pull request #22 from BernhardKonrad/master

Colors on Doctors side
mafdslj
Merge branch 'master' of https://github.com/JeromeLefebvre/ChildFirst
Merge pull request #24 from BernhardKonrad/master

Two shades of green
simplifying the transition
Merge branch 'master' of https://github.com/JeromeLefebvre/ChildFirst
added the popup back
Merge pull request #25 from jiag/master

added the popup back
fixing the camera?
Chaning the font for iPad demo
Changed the take picture screen
Adds short version of Q and A