changed button logic;
Merge branch 'master' of github.com:carinaboo/familyhub