Fixed css problem where div was with height=0 (thus causing 2 bugs)
Changed darker color and coffee break
Started the merge of ours and fbaup content
Cropped logo and removed extra boxes on sponsors
Changed friendly to friend sponsors
Merge pull request #4 from tiagovarela/fbaup_migration

Started working on FBAUP merge