Commit first
Commit first
Skeleton ready
Skeleton ready
Merge remote-tracking branch 'remotes/origin/master'

web/Phalcon

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Fixed
Add language switcher, Multidomain template
Commit before partial branches
Merge remote-tracking branch 'origin/master' into vavas

Conflicts:
	app/controllers/ControllerBase.php
	public/index.php
layout