- 
# Conflicts: # frontend/controllers/ServiceController.php
 - 
2
 - 
# Conflicts: # frontend/views/layouts/main.php
 
- 
# Conflicts: # frontend/controllers/SiteController.php # frontend/views/site/index.php
 
- 
bug fix
 - 
- edit comments
 
- 
- delete about
 
- 
- package
 
- 
- add doctor to question
 
- 
- prices - disable artboxmodal css