merge
Merge branch 'master' of https://github.com/nitzanw/FamilyBox

 the commit.
fix add photos layout
fix lollipop crash