Did merging of project files in Business folder
Did code merge of Business from root_VS2010
Did code merge of Business from root_VS2010
1) Rosurce file chages
Did code merge of Businees from root_VS2010
1) Added new method workflow
2) Region and alignement changes
3) Exception messages cod echages
Merge https://github.com/SymphonyTeleca/OpenTouryoTemplates
Merge pull request #5 from SymphonyTeleca/master

Did code merge of Business from root_VS2010 to VS2012
Did merging of code Framework from root_VS2010 to root_2012
1) code changes of List view event handler and rest of the code
Did code merging of Public from VS2010 to VS2012
1) Code changes of increasing code coverage
2) changes of adding SaveJson and LoadJson methods
3) Multiple db support changes
4) Added Newtonsoft.Json.dll
Merge pull request #6 from SymphonyTeleca/master

Merged code of Infrastructure from VS2010 to VS2012
Did code merge of Tools folder from root_VS2010 to VS_2012
1) Added resource files in project files for internationalization
Did code merge of Tools folder from VS2010 to VS2012
1) Did internationalization changes
2) Did code chages for SelectJoin query support in dp_query tool
3) Added new resource files
Merge pull request #7 from SymphonyTeleca/master

Merged code of Tools from root_2010 to root_VS2012
Did code merge of files folder from VS2010 to VS2012
1) Added new templates for Select Join query support
2) Modified existing templates by removing db provider drop down
Merge pull request #8 from SymphonyTeleca/master

Did code merge of files folder from VS2010 to VS2012
Did code merge of VB folder from VS2010 to VS2012
1) Merged code of Multiple db support in _3TierEngine
2) Added license information in _3TierReturnValue.vb
3) Merged code of internationalization
4) Added new classes files of Workflow
Merge pull request #9 from SymphonyTeleca/master

Did code merge of VB folder from VS2010 to VS2012
Code Merge from Root_easySetup to root_VS2010
Completed Code merge of Framework folder after adding event support of ListView,Radio button list and Check box list feature.
1) Code merging in BaseController.cs
2) Code merging is done in FxCmnFunction.cs for controls
3) Code merge is done in FxLiteral.cs for new controls
Merge branch 'master' of https://github.com/SymphonyTeleca/OpenTouryoTemplates
Merge pull request #10 from SymphonyTeleca/master

Code Merge from Root_easySetup to root_VS2010
Merging of root-easysetup=>root_VS2010
Merging of Tools Folder.
1) Added New forms for select join Query support in DPQuery_Tool
2) Added resource files for Internationalization
3) Modified code in DaoGen_Tool to support select join query support