.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/ru/pda/nitro/database/Contract.java
	src/ru/pda/nitro/database/Database.java
warnings