Set up structure for double pricing
Merge branch 'master' of https://github.com/thatsgenius/lalas

Conflicts:
	services.php