fixed bug
fixed bug
Merge branch '0726-f1' into master-angularfire