Sat 4 of Oct 2014 meeting notes update
fixed merge conflict for meeting notes