1
Merge branch 'master' of https://github.com/goper/annytrees.loc

Conflicts:
	application/views/index/carcass.php
	application/views/index/main/view.php
	media/css/style.css
	media/img/footer/_notes/dwsync.xml
	media/js/script.js