Include static data and put it in /usr/share
Merge remote-tracking branch 'origin/master' into tmp

* origin/master:
  updated setup.py
  minor enhancement in db integrity

Conflicts:
	setup.py