Added Andrew's updates
Merge branch 'aaron' of github.com:WeeverApps/weever-plugin-common into aaron

Conflicts:
	js/models/subtab.joomlaarticle.js
	js/models/subtab.joomlablog.js
	js/models/subtab.joomlamap.js
	js/models/subtab.joomlaproximity.js
	js/models/subtab.k2blog.js
	js/models/subtab.k2item.js
	js/models/subtab.k2map.js
	js/models/subtab.k2proximity.js
Merge branch 'aaron' of github.com:WeeverApps/weever-plugin-common into aaron
Added console for file upload errors
Merge branch 'aaron' of github.com:WeeverApps/weever-plugin-common into aaron