Joomla 1.5 files
vishal - git changes for joomla3.0 first commit
Merge https://github.com/techjoomla/com_api

Conflicts:
	code/admin/api.php
	code/admin/views/key/tmpl/default.php
	code/admin/views/key/view.html.php
	code/admin/views/keys/tmpl/default.php
	code/admin/views/keys/view.html.php
	code/api.xml
	code/redshop/redshop.php
	code/redshop/redshop.xml
	code/redshop/redshop/helper.php
	code/redshop/redshop/summary.php
	code/site/api.php
	code/site/libraries/admin/controller.php
	code/site/libraries/authentication.php
	code/site/libraries/authentication/key.php
	code/site/libraries/authentication/login.php
	code/site/libraries/controller.php
	code/site/libraries/model.php
	code/site/libraries/plugin.php
	code/site/models/key.php
	code/site/views/keys/view.html.php
	code/socialads/socialads.xml