added css and changes to the index and lyout pages
Merge branch 'master' into daniel_luke
changes on css added icomon home buttom
fixed merge conflicts
changes on layout, organization on layout view missing
Merge branch 'daniel_luke'
organize of the merge conflicts