upload zend cloud
Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/index.php
Merge branch 'master' of https://eidyia.my.phpcloud.com/git/eidyia
upload zend cloud