arreglos menores
Merge branch 'master' of https://github.com/hyoume/aesir

Conflicts:
	co2cloud/app/View/Activities/view.ctp
	co2cloud/app/View/Elements/flash_error.ace.ctp
	co2cloud/app/View/Elements/flash_notice.ace.ctp
	co2cloud/app/View/Elements/flash_success.ace.ctp
	co2cloud/app/View/Elements/flash_warning.ace.ctp
	co2cloud/app/View/Elements/navbar.ace.ctp
	co2cloud/app/View/Elements/sidebar.ace.ctp
	co2cloud/app/View/Sources/add.ctp
	co2cloud/app/webroot/css/bootstrap-editable.css
	co2cloud/app/webroot/js/bootstrap-colorpicker.min.js
	co2cloud/app/webroot/js/fuelux/data/fuelux.tree-sampledata.js
	themes/ace/assets/css/bootstrap-editable.css
	themes/ace/assets/js/bootstrap-colorpicker.min.js
	themes/ace/assets/js/fuelux/data/fuelux.tree-sampledata.js
	themes/ace/blank.html
	themes/ace/buttons.html
	themes/ace/calendar.html
	themes/ace/elements.html
	themes/ace/error-404.html
	themes/ace/error-500.html
	themes/ace/form-elements.html
	themes/ace/form-wizard.html
	themes/ace/gallery.html
	themes/ace/grid.html
	themes/ace/index.html
	themes/ace/invoice.html
	themes/ace/login.html
	themes/ace/pricing.html
	themes/ace/profile.html
	themes/ace/tables.html
	themes/ace/typography.html
	themes/ace/widgets.html
	themes/ace/wysiwyg.html