Some reorganization, and introduced nested templates
Merge branch 'master' of https://github.com/dubrowgn/Reward-Yourself

Conflicts:
	include/api.php
	template/page.html