Merge branch 'develop'

Conflicts:
	controllers/basecontroller.cfc
	controllers/baseextension.cfc
	controllers/inc_publishnow.cfm
	controllers/plugins.cfc
	css/styles.css
	extbuilder.local.eml
	img/icon-gadget.png
	img/magicwand-100.gif
	img/magicwand.gif
	layouts/plugins.cfm
	layouts/plugins/addtag.cfm
	services/ExtensionsInfo.cfc
	views/extension/autoupdatecheck.cfm
	views/extension/editinstall.cfm
	views/plugins/_addplugin.cfm
	views/plugins/_pluginsettings.cfm
	views/plugins/default.cfm
	views/tests/default.cfm
Merge branch 'master' of github.com:getrailo/Extension-Builder
Update ExtensionManager.cfc

Just saw Gert fix this in December 2012
    http://www.youtube.com/watch?v=jO7-_ALftK0
Merge pull request #30 from webonix/patch-1

Update ExtensionManager.cfc
Merge branch 'master' into develop