ED. Add php UK conference and principles notes.
Merge remote-tracking branch 'origin/master'