OK, let's start to develop it on Linux!
Merge branch 'master' of https://github.com/srgg6701/nupic.webApp.python

Conflicts:
	.idea/.name
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	.idea/workspace.xml
	webapp/manage.py
	webapp/webapp/settings.py
Made working on Ubuntu.