dfbdsk
Merge branch 'master' of https://github.com/fdograph/CDEC

Conflicts:
	nbproject/private/private.properties
	wp-content/themes/cdec/index.php