Ended refactoring for plants
Updated sources
Merge branch 'master' of https://github.com/saldarriaga/102_kerry

Conflicts:
	protected/controllers/PresentationController.php