CRM-967 Magento order completion iframe should be Oro-styled
CRM-964: Magento order completion iframe should be Oro-styled
remove string from gitignore
Merge branch 'master' into task/CRM-964

Conflicts:
	app/code/community/Oro/Api/Model/Observer/Crm/Controller.php
Merge branch 'task/CRM-964' of github.com:laboro/magento-oro-crm into task/CRM-964
Merge pull request #14 from laboro/task/CRM-964

Task/crm 964
CRM-1553: Create an example of tracking code for Magento website
   - module implementation
CRM-1553: Create an example of tracking code for Magento website
   - license module name fix
CRM-1553: Create an example of tracking code for Magento website
   - code quality fixes
CRM-1553: Create an example of tracking code for Magento website
    - added configuration settings
CRM-1553: Create an example of tracking code for Magento website
   - added visitor ID to user identifier data
Merge branch 'master' into ticket/CRM-1553

Conflicts:
	var/connect/Oro_Api.xml
Merge pull request #19 from laboro/ticket/CRM-1553

CRM-1553: Create an example of tracking code for Magento website
CRM-1553 Create an example of tracking code for Magento website
CRM-1553: Create an example of tracking code for Magento website
   - extension updated
Merge pull request #20 from laboro/ticket/CRM-1553

CRM-1553 Create an example of tracking code for Magento website
CRM-1553 Create an example of tracking code for Magento website
   - improve UIX in configuration
   - update extension description
   - update packed extension
Merge pull request #21 from laboro/ticket/CRM-1553

CRM-1553 Create an example of tracking code for Magento website
Merge pull request #22 from laboro/ticket/CRM-1553

CRM-1553 Create an example of tracking code for Magento website
CRM-1946: Oro_Tracking exception on secured pages with non-secured crm configuration param
    - fixed typщ
    - added error handling
    - added additional warning to configuration page
    - updated extension version
Merge pull request #23 from laboro/ticket/CRM-1946

CRM-1946: Oro_Tracking exception on secured pages with non-secured crm c...