Merge branch 'develop'

Conflicts:
	check-in.php
	install/upgrade_1262.php
	templates_c/.gitignore
	version.php
Fixed typo in sql script
fixes #76 - Some filetypes are coming through as unknown
fixes #75 - Notice: Undefined variable: id in check-in.php
fixes #74 - Undefined variable: modified_date in /var/www/doc/functions.php on line 383
Merge branch '1.2.6.3a-hotfix' into develop
Merge branch 'develop' of github.com:opendocman/opendocman into develop