conflicts
Merge branch 'master' of https://github.com/eleftherias/candystore2

Conflicts:
	candystore/application/controllers/candystore.php