changes on cms pages from server
# Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/santonil2003/test
Merge branch 'master' of https://github.com/santonil2003/test
Merge branch 'master' of https://github.com/santonil2003/test
inter change bak file and orignal file content on server
Merge branch 'master' of https://github.com/santonil2003/test
Merge branch 'master' of https://github.com/santonil2003/test
Merge branch 'master' of https://github.com/santonil2003/test

Conflicts:
	addtoorder.bak.php