OC-1800 - Fix for ups when no rates available
alerted the upload buttons so it uses the load message instead of spinning icon
fixing the text for upload buttons
Merge pull request #1731 from david-wm/OC-1800v2

OC-1800 - Fix for ups when no rates available
finished adding the loading text to all upload buttons
Merge branch 'master' of https://github.com/opencart/opencart
Coding standards fixes for CBA admin controller and view
just removed the testing code for mod system
header fix for gap that appeared
Merge pull request #1733 from david-wm/CBA-fixes

Coding standards fixes for CBA admin controller and view
css update
Merge branch 'master' of https://github.com/opencart/opencart
unfinished admin updates
Adds missing username field to admin profile template
more css work done on th new admin also changing help text to tooltips
more help tooltip work done
Removed unrequired language entries.

Tidied indents on language file.
updated pp_login to match the rest of opencarts code base.

renamed profiles to recurring since they are recurring profiles and not profile which could mean any thing!
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/language/english/catalog/profile.php
more help tooltip work done