Removed quote marks from language string to allow it to show in tooltip.
Fixed order id variable when craeting an order in the API.
Renamed google talk to hangouts in FE.
Fix for labels in activity drop down menu.
Added HTML support for tooltips by default.
https://github.com/opencart/opencart/issues/1739
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/controller/extension/modification.php
just added a limit to the logging for the mod system.
Update recurring.php

just added spaces
Update pp_express.php

just added spaces
Update recurring.php

just added spaces
update the clear modifications code
Updated language indents (more to do)

Stripped spacing in modification.php
Merge branch 'master' of https://github.com/opencart/opencart
action update
Merge branch 'master' of https://github.com/opencart/opencart
Updated version number for alpha releases.
Merge branch 'master' of https://github.com/opencart/opencart
fix for https://opencart.atlassian.net/browse/OC-1803
Merge branch 'master' of https://github.com/opencart/opencart