Pin to WordPress 3.6
Point wordpress submodule to 3.6.1
Merge pull request #37 from victormoukhortov/submodule

Point WordPress submodule to 3.6.1
Merge remote-tracking branch 'upstream/master'

Conflicts:
	wp