Options framework
Merge branch 'master' of github.com:andreyzb/dveri

Conflicts:
	wp-content/plugins/options-framework-plugin