Merge branch 'master' of git://github.com/netzke/netzke-core

Conflicts:
	javascripts/ext.js