fixed bugs related to the new way the teambuilder is loaded
move includes and loading statemekt
Merge branch 'design' into gh-pages