display in suitable place
Merge branch '13080102' into master-angularfire