merged wordpress and login
merged notes updates with master