Merge branch 'master' into develop
Merge branch 'master' into develop
Add slides for 2014-06-18

Signed-off-by: Adam Jimerson <vendion@gmail.com>
Merge branch 'develop'