updating some tempaltes
updating mysql
removing file
updating
Merge branch 'dev'