Delete signin.php
Merge branch '3.1.0'

Conflicts:
	Apache2/conf/httpd.conf
	README.txt
	Sybase/OCS-15_0/include/bkpublic.h
	Sybase/OCS-15_0/include/csconfig.h
	Sybase/OCS-15_0/include/cspublic.h
	Sybase/OCS-15_0/include/cstypes.h
	Sybase/OCS-15_0/include/ctpublic.h
	Sybase/OCS-15_0/include/sqlca.h
	Sybase/OCS-15_0/include/sqlda.h
	Sybase/OCS-15_0/include/sybdb.h
	Sybase/OCS-15_0/include/sybdbn.h
	Sybase/OCS-15_0/include/syberror.h
	Sybase/OCS-15_0/include/sybesql.c
	Sybase/OCS-15_0/include/sybfront.h
	Sybase/OCS-15_0/include/sybhesql.h
	Sybase/OCS-15_0/include/syblogin.h
	Sybase/OCS-15_0/include/sybtesql.h
	Sybase/OCS-15_0/ini/libtcl.cfg
	Sybase/OCS-15_0/ini/sample.cfg
	Sybase/charsets/META-INF/component.xml
	Sybase/ini/META-INF/component.xml
	Sybase/ini/sql.ini
	Sybase/locales/META-INF/component.xml
	asebox_report/ARContext_restore.php
	asebox_report/ASE/AppLog_statistics.php
	asebox_report/ASE/AseDbSpce.php
	asebox_report/ASE/AseDbSpce_detail.php
	asebox_report/ASE/CachedObj_statistics.php
	asebox_report/ASE/CachedObj_statisticsTOP5.php
	asebox_report/ASE/CachedStatements_detail.php
	asebox_report/ASE/CachedStatements_statistics.php
	asebox_report/ASE/Fragmentation_statistics.php
	asebox_report/ASE/LockWaits_list.php
	asebox_report/ASE/Missing_statistics.php
	asebox_report/ASE/Now.php
	asebox_report/ASE/QPMetrics_statement_detail.php
	asebox_report/ASE/QPMetrics_statistics.php
	asebox_report/ASE/SQLBrowser.php
	asebox_report/ASE/Spinlock_statistics.php
	asebox_report/ASE/StatServers.php
	asebox_report/ASE/StatServersNew.php
	asebox_report/ASE/applog_procs.php
	asebox_report/ASE/asemon_configuration.php
	asebox_report/ASE/auditingCnx_detail.php
	asebox_report/ASE/deadlocks_list_preV157.php
	asebox_report/ASE/device_detail.php
	asebox_report/ASE/devices_summary.php
	asebox_report/ASE/fragmentation_detail.php
	asebox_report/ASE/graphAvgEngineUsage.php
	asebox_report/ASE/graphCPUSystem.php
	asebox_report/ASE/lock_contention.php
	asebox_report/ASE/lock_contention_V15.php
	asebox_report/ASE/locks_list.php
	asebox_report/ASE/locks_list_V15.php
	asebox_report/ASE/now_statistics.php
	asebox_report/ASE/now_syslogshold.php
	asebox_report/ASE/object_detail.php
	asebox_report/ASE/object_statistics.php
	asebox_report/ASE/proc/sp_sysmon_kernel_threaded.sql
	asebox_report/ASE/proc/sysmon_kernel_threaded_V157.sql
	asebox_report/ASE/procMDA_statistics.php
	asebox_report/ASE/procedure_detail.php
	asebox_report/ASE/process_detail.php
	asebox_report/ASE/process_repart.php
	asebox_report/ASE/reportASE.php
	asebox_report/ASE/show_SrvCollectors.php
	asebox_report/ASE/spinlock_detail.php
	asebox_report/ASE/sql/sql_CachedObj_V15_statistics.php
	asebox_report/ASE/sql/sql_CachedObj_statistics.php
	asebox_report/ASE/sql/sql_SysWaits_list.php
	asebox_report/ASE/sql/sql_applog_statistics.php
	asebox_report/ASE/sql/sql_applog_summary.php
	asebox_report/ASE/sql/sql_now_statistics.php
	asebox_report/ASE/sql/sql_procMDA_statistics.php
	asebox_report/ASE/statement_detail.php
	asebox_report/ASE/statements_statistics.php
	asebox_report/ASE/syslogshold_statistics.php
	asebox_report/ASE/syswaits.php
	asebox_report/ASE/trendProc.php
	asebox_report/ASE/trends.php
	asebox_report/AmStats.php
	asebox_report/StatServers.php
	asebox_report/StatServersBasic.php
	asebox_report/StatServersOne.php
	asebox_report/connectArchiveServer.php
	asebox_report/data.php
	asebox_report/default_archive_cnx.php
	asebox_report/default_archive_server_list.php
	asebox_report/export/export-table.php
	asebox_report/export/export-to.php
	asebox_report/images/Thumbs.db
	asebox_report/index.php
	asebox_report/menu.php
	asebox_report/scripts/asemon_report.js
	asebox_report/scripts/calendrier.js
	asebox_report/stylesheets/common.css
	asebox_report/stylesheets/maindiv.css
	asebox_report/stylesheets/menu.css
	setup.bat
	startApache.bat