migrates project layout to OpenShift convention
Merge branch 'dev'
Merge remote-tracking branch 'openshift/master' into dev
Merge branch 'dev'
fixes typo in settings
Merge branch 'dev'
fixes typo in settings
Merge branch 'dev'

Conflicts:
	wsgi/checkin/settings.py
adds migration task to deployment hook
Merge branch 'dev'