It doesn't metter
Merge remote-tracking branch 'origin/sem'

Conflicts:
	.idea/workspace.xml
	app_keyman/admin.pyc
	app_keyman/models.pyc
	app_keyman/views.pyc