Creating template
Update setup.py
Delete stuff related to sqlite.db
Merge remote-tracking branch 'openshift/master'
Clean up merge