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

Conflicts:
	.pydevproject
	.settings/org.eclipse.core.resources.prefs
manual merge victt.master
secretKey order
merge pypi
Pip register version
pip install ( banner corrections )
Update README.md
Update README.md
Update README.md
Merge branch 'master' of https://github.com/DarioGT/ProtoExt into PyPI-install

Conflicts:
	.gitignore
	README.md
	db/testproto.db
	src/protoLib/utils/downloadFile.py
	src/protobase/static/buildSenchaJS.sh
	src/softmachine/settings.py
	src/softmachine/settings_development.py
	src/softmachine/settings_production.py
	src/softmachine/urls.py
	static/css/custom.css
Update setup.py
Merge pull request #7 from victorette/PyPI-install

PyPI install
Merge pull request #20 from victorette/master

Merge Fork victorette/django-softmachine