fake commit
fix
moved haml out of dev in gem file
adds to user edit in case of no photo
Merge branch 'master' of github.com:asrkennedy/uniFi
Merge branch 'master' into development_l