modify main template
add navbar
Merge branch 'master' into design
add more pages and menu
add main block in index.htm