Move functions to enable hook
Merge branch 'master' into 4.5

Conflicts:
	wpbasepage.php
emove unneeded WordPress Plugin file
Merge pull request #1 from kcristiano/4.5

Move functions to enable hook