updated wordpress and all plugins
Merge branch 'update/12-12-2014'

Conflicts:
	wp-content/themes/glp/config.codekit