separation protobase
Merge branch 'master' of github.com:DarioGT/ProtoExt

Conflicts:
	.pydevproject
	.settings/org.eclipse.core.resources.prefs