index rename
readme rename
Resync
Merge branch 'master' of https://github.com/ademahendra/leisure

Conflicts:
	README.md
	advanced/backend/views/layouts/main.php
	advanced/frontend/views/site/index.php
read me