Up
Added cxv2_tools application
Merged with Xukum
Merge branch 'master' of https://github.com/Xukum/pycdb into Xukum-master

Conflicts:
	conf/common.py
	conf/local_alexmak_hare.py
	graph_db/configuration.py
Added By Nikita & AM
Merge pull request #14 from Xukum/master

Added By Nikita & AM
up
moved to django 1.7, new folder structure applied
Merge branch 'master' of github.com:alexmakeev87/pycdb

Conflicts:
	.gitignore
Example added
new django version updated