Merge branch 'master' of C:\xampp\htdocs\surf with conflicts.
[updated] naming refactoring