Merge branch 'master' into 1.3.0

Conflicts:
	.gitignore
	.travis.yml
	CHANGELOG
	README.md
	build/32bits/phalcon.c
	build/32bits/phalcon.h
	build/32bits/php_phalcon.h
	build/64bits/phalcon.c
	build/64bits/phalcon.h
	build/64bits/php_phalcon.h
	build/safe/phalcon.c
	build/safe/phalcon.h
	build/safe/php_phalcon.h
	config.py
	ext/acl/adapter/memory.c
	ext/annotations/Makefile
	ext/annotations/adapter.c
	ext/annotations/annotation.c
	ext/annotations/annotation.h
	ext/annotations/base.c
	ext/annotations/parser.c
	ext/annotations/scanner.c
	ext/assets/manager.c
	ext/assets/manager.h
	ext/cache/backend/apc.c
	ext/cache/backend/memory.c
	ext/cache/backend/xcache.c
	ext/clean
	ext/cli/console.c
	ext/config.c
	ext/config.w32
	ext/config/adapter/php.h
	ext/db/adapter/pdo/mysql.c
	ext/db/adapter/pdo/oracle.c
	ext/db/adapter/pdo/postgresql.c
	ext/db/adapter/pdo/sqlite.c
	ext/db/column.c
	ext/db/dialect/mysql.c
	ext/debug.c
	ext/di/injectable.c
	ext/dispatcher.c
	ext/events/manager.c
	ext/events/manager.h
	ext/flash/session.c
	ext/forms/element.c
	ext/forms/form.c
	ext/http/cookie.c
	ext/http/request.c
	ext/http/response.c
	ext/http/response/cookies.c
	ext/image/exception.c
	ext/kernel/alternative/fcall.c
	ext/kernel/alternative/fcall.h
	ext/kernel/alternative/object.c
	ext/kernel/array.c
	ext/kernel/array.h
	ext/kernel/assert.c
	ext/kernel/exception.c
	ext/kernel/exception.h
	ext/kernel/fcall.h
	ext/kernel/framework/di.c
	ext/kernel/framework/router.c
	ext/kernel/framework/url.c
	ext/kernel/main.c
	ext/kernel/main.h
	ext/kernel/memory.c
	ext/kernel/memory.h
	ext/kernel/object.c
	ext/kernel/require.c
	ext/kernel/session.c
	ext/kernel/session.h
	ext/kernel/string.c
	ext/kernel/string.h
	ext/logger/adapter.c
	ext/logger/adapter/file.c
	ext/logger/adapter/file.h
	ext/logger/adapter/firephp.c
	ext/logger/formatter.c
	ext/logger/formatter/firephp.c
	ext/logger/formatter/firephp.h
	ext/mvc/application.c
	ext/mvc/collection.c
	ext/mvc/dispatcher.c
	ext/mvc/dispatcher.h
	ext/mvc/micro/collection.c
	ext/mvc/micro/collection.h
	ext/mvc/model.c
	ext/mvc/model.h
	ext/mvc/model/criteria.c
	ext/mvc/model/manager.c
	ext/mvc/model/metadata.c
	ext/mvc/model/metadata.h
	ext/mvc/model/query.c
	ext/mvc/model/query/base.c
	ext/mvc/model/query/builder.c
	ext/mvc/model/query/parser.c
	ext/mvc/model/resultset/complex.c
	ext/mvc/model/row.c
	ext/mvc/model/row.h
	ext/mvc/model/validator.c
	ext/mvc/router.c
	ext/mvc/router.h
	ext/mvc/router/annotations.c
	ext/mvc/routerinterface.h
	ext/mvc/view.c
	ext/mvc/view/engine/volt.c
	ext/mvc/view/engine/volt/base.c
	ext/mvc/view/engine/volt/compiler.c
	ext/mvc/view/engine/volt/parser.c
	ext/mvc/view/engine/volt/scanner.h
	ext/paginator/adapter/model.c
	ext/paginator/adapter/nativearray.c
	ext/paginator/adapter/querybuilder.c
	ext/pconfig.h
	ext/phalcon.c
	ext/phalcon.h
	ext/php_phalcon.h
	ext/queue/beanstalk.c
	ext/security.c
	ext/security.h
	ext/session/adapter.h
	ext/session/bag.c
	ext/tag.c
	ext/tag.h
	ext/tag/select.c
	ext/tests/issue-1018.phpt
	ext/tests/issue-1099.phpt
	ext/tests/issue-1190.phpt
	ext/tests/issue-1216.phpt
	ext/tests/issue-1263.phpt
	ext/tests/issue-1345.phpt
	ext/tests/issue-1575.phpt
	ext/tests/issue-1637.phpt
	ext/tests/issue-1700.phpt
	ext/tests/issue-1716.phpt
	ext/tests/issue-1742.phpt
	ext/tests/issue-743.phpt
	ext/tests/issue-947.phpt
	ext/text.c
	ext/translate.h
	ext/validation.c
	ext/validation/message/group.c
	ext/version.c
	php-tests/library/Phalcon/Test/Config.php
	php-tests/library/Phalcon/Test/ModelTestCase.php
	php-tests/tests/Phalcon/Acl/Adapter/Memory/UnitTest.php
	php-tests/tests/Phalcon/Acl/Resource/UnitTest.php
	php-tests/tests/Phalcon/Acl/Role/UnitTest.php
	php-tests/tests/Phalcon/Escaper/UnitTest.php
	php-tests/tests/Phalcon/Filter/Helper/IPv4.php
	php-tests/tests/Phalcon/Filter/UnitTest.php
	php-tests/tests/Phalcon/Flash/Direct/CustomCSSTest.php
	php-tests/tests/Phalcon/Flash/Direct/DefaultCSSTest.php
	php-tests/tests/Phalcon/Flash/Direct/EmptyCSSTest.php
	php-tests/tests/Phalcon/Http/Request/UnitTest.php
	php-tests/tests/Phalcon/Logger/Adapter/File/Helper/Listener.php
	php-tests/tests/Phalcon/Logger/Adapter/File/Helper/Model.php
	php-tests/tests/Phalcon/Logger/Adapter/File/MySqlTest.php
	php-tests/tests/Phalcon/Logger/Adapter/File/PostgresqlTest.php
	php-tests/tests/Phalcon/Logger/Adapter/File/SqliteTest.php
	php-tests/tests/Phalcon/Logger/Adapter/File/UnitTest.php
	php-tests/tests/Phalcon/Security/UnitTest.php
	php-tests/tests/Phalcon/Tag/FunctionalTest.php
	php-tests/tests/Phalcon/Tag/Helper/Model.php
	php-tests/tests/Phalcon/Tag/MysqlTest.php
	php-tests/tests/Phalcon/Tag/PostgresqlTest.php
	php-tests/tests/Phalcon/Tag/SqliteTest.php
	php-tests/tests/Phalcon/Tag/UnitTest.php
	php-tests/tests/Phalcon/Text/UnitTest.php
	php-tests/tests/Phalcon/Translate/Adapter/NativeArray/UnitTest.php
	php-tests/tests/Phalcon/Url/UnitTest.php
	php-tests/tests/Phalcon/Version/UnitTest.php
	php-tests/tests/Phalcon/View/Engines/Volt/UnitTest.php
	php-tests/tests/PhalconTestHelper.php
	php-tests/tests/app/models/Parts.php
	php-tests/tests/app/models/Robots.php
	php-tests/tests/app/models/RobotsParts.php
	php-tests/tests/phpunit.xml
	scripts/gen-build.php
	unit-tests/BeanstalkTest.php
	unit-tests/CacheTest.php
	unit-tests/ConfigTest.php
	unit-tests/DbDescribeTest.php
	unit-tests/DbDialectTest.php
	unit-tests/EventsTest.php
	unit-tests/FormsTest.php
	unit-tests/ModelsTest.php
	unit-tests/TagTest.php
	unit-tests/TranslateTest.php
	unit-tests/ValidationTest.php
	unit-tests/ci/install_prereqs.sh

.gitignore

@@ -44,4 +44,4 @@ build/install2
 /ext/modules
 /ext/run-tests.php
 /ext/coverage
-/unit-tests/nbproject/private/
+/unit-tests/nbproject/private/

.gitmodules

@@ -1,8 +1,9 @@
 [submodule "php-tests/library/Mustache"]
-        path = php-tests/library/Mustache
-        url = git://github.com/bobthecow/mustache.php.git
+	path   = php-tests/library/Mustache
+	url    = https://github.com/bobthecow/mustache.php.git
+	branch = master
 
 [submodule "php-tests/library/Twig"]
-	path = php-tests/library/Twig
-	url = git://github.com/fabpot/Twig.git
-
+	path   = php-tests/library/Twig
+	url    = https://github.com/fabpot/Twig.git
+	branch = master

.travis.yml

@@ -38,4 +38,4 @@ notifications:
     - [email protected]
     - [email protected]
     - [email protected]
-    - [email protected]
+    - [email protected]

CHANGELOG

@@ -937,4 +937,4 @@ Phalcon_Model_Base::sum, etc. to avoid SQL injections
 0.2.6
  - Fixed segfault when reading _SESSION superglobal when no session_start has been made
  - Added Phalcon_Cache with adapter File
- - Added method Phalcon_Model_Manager::getHasOneRecords
+ - Added method Phalcon_Model_Manager::getHasOneRecords

README.md

@@ -12,7 +12,7 @@ Phalcon is written in C with platform independence in mind. As a result, Phalcon
 
 To install Phalcon on Windows:
 
-1. Download [Phalcon for Windows](http://phalconphp.com/en/download/windows) 
+1. Download [Phalcon for Windows](http://phalconphp.com/en/download/windows)
 2. Extract the DLL file and copy it to your PHP extensions directory
 3. Edit your php.ini file and add this line: `extension=php_phalcon.dll`
 4. Finally, restart your webserver