update
Merge branch 'master' of https://github.com/netkiller/phalcon
ss

Conflicts:
	app/library/Elements.php
	app/outdoor/controllers/IndexController.php
	app/photography/components/Menu.php