17.06.2013
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	Load_PostgreSql/Main.dfm