connconfig; 12.03.2014 as 17:24h
Merge branch 'dev' of github.com:marclebon/provapronta into dev

Conflicts:
	sys/classes/db/ConnConfig.php