fix ticket #1043 - rename defaultconfig.ini.php of a project - http://developer.jelix.org/ticket/1043
Bumped version to 1.6.0a1-pre
changed version to 1.6.0a1pre
drop this unnecessary fix - will be done alone
ticket 1502 - jTplCompiler error
defaultconfig.ini.php is renamed to mainconfig.ini.php

changes merge from Foxmask's branch
New jApp::mainConfigFile() method to retrieve the path of the main configuration file

It is a solution to avoid this deprecated_in_jelix_1.5.php file.
Removed deprecated_in_jelix_1.5.php file
Update lib/jelix-modules/jpref/classes/jPrefManager.php

Incorrect path for required files before class declaration, they were pointing to the old location.
Add pattern in conditions, like the (select|insert|update)pattern.
Merge pull request #126 from kissifrot/master

jDao: Add pattern in conditions, like the (select|insert|update)pattern.
Merge branch 'jelix-1.5.x'

Conflicts:
	lib/jelix/VERSION
	testapp/VERSION
Update TCPDF

5.9.193 -> 5.9.206
Use comment on columns to get form labels, Oracle version.
Update jquery.include.js

compat with jQuery 1.9

The jQuery.browser() method has been removed in 1.9 (http://goo.gl/QrwVA)
Merge branch 'comment-oracle' of git://github.com/kissifrot/jelix
Merge remote-tracking branch 'remotes/upstream/master'
Add version expansion in jacl2 and jpref modules.
Merge pull request #129 from vincentv/master

jquery.include.js : compat with jQuery 1.9
Merge pull request #127 from kissifrot/master

Update TCPDF