working on social working
Merge branch 'master' of https://github.com/maninsoft/smartworksV3.git
woring on social point management
social management
Merge branch 'master' of https://github.com/maninsoft/smartworksV3.git

Conflicts:
	WebContent/WEB-INF/dbscript/mssql/mssql_table_smartworksV3.ddl