fix conflict
finish new style - tabs
delete temp file
add fancybox to lessonplan activities. Qiu