add delete function
add delete function
add delete function
changed pages to use templet layout
Merge origin/master