fix block pannel
Merge branch '13072607' into master-angularfire