columns is not required param
if columnMap defined we use only mappe name

Conflicts:
	phalcon/mvc/model.zep
test
tests and def value-null again

Conflicts:
	phalcon/mvc/model.zep
tabs
Fix issue which cause an error when join is false
Insert test case for output of asset collection that is not joined
Fixing warnings caused by unused variables
Fixes #3042, improving coding style
Improving coding style, removing warnings
Merge pull request #3039 from brainformatik/2.0.0

[2.0.0] Fix asset collection join issue
Removing warnings related to unused variables, coding style
Remove final from Volt compiler _compileSource
Rename getModelsManager to getCollectionManager in Collection class
Fix #3048 - queryKeys is bugged for XCache Backend
Fixing warnings
Using latest Zephir
Merge pull request #2986 from quantum13/toarray_fix

if columnMap defined we must use only mapped name
Add method Phalcon\Mvc\Model\Resultset::update
Improving coding style
Merge branch '2.0.0' of https://github.com/phalcon/cphalcon into 2.0.0
Merge pull request #3047 from vpg/backwardcompatibility

[1.3.4 - 2.0.0] Backward compatibility fixes