added base classes page info and favicon
resolved conflicts in master index