Merge branch 'master' into phalcon

Conflicts:
	public/index.php
Merge branch 'master' into phalcon

Conflicts:
	public/index.php
Merge branch 'phalcon'